Greg, here's the patch to fix this. This makes usb-storage work again. Please apply.
Matt
On Sun, Feb 02, 2003 at 10:04:23AM -0800, David Brownell wrote:
>
> > Hmm try
> >
> > + /* not all host controllers use DMA (like the mainstream pci ones);
> > + * they can use PIO (sl811) or be software over another transport.
> > + */
> > + dma = (dev->dev.dma_mask == 0);
> >
> > making that line in usb_sg_init() use "!= 0". (Untested, "seems right".)
> >
> > Most curious that it would seem to work for me.
>
> Seems like the version I've been using has "!=" ... which would explain
> some things. The patch I sent to Greg wasn't the one which passed my
> pre-submit retesting (also had an unimportant comment tweak).
# This is a BitKeeper generated patch for the following project:
# Project Name: greg k-h's linux 2.5 USB kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.678 -> 1.679
# drivers/usb/core/message.c 1.26 -> 1.27
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/02/02 [EMAIL PROTECTED] 1.679
# Fix an inversion in logic. This was causing usb-storage to fail.
# --------------------------------------------
#
diff -Nru a/drivers/usb/core/message.c b/drivers/usb/core/message.c
--- a/drivers/usb/core/message.c Sun Feb 2 15:12:43 2003
+++ b/drivers/usb/core/message.c Sun Feb 2 15:12:43 2003
@@ -319,7 +319,7 @@
/* not all host controllers use DMA (like the mainstream pci ones);
* they can use PIO (sl811) or be software over another transport.
*/
- dma = (dev->dev.dma_mask == 0);
+ dma = (dev->dev.dma_mask != 0);
if (dma)
io->entries = usb_buffer_map_sg (dev, pipe, sg, nents);
else
--
Matthew Dharm Home: [EMAIL PROTECTED]
Maintainer, Linux USB Mass Storage Driver
We can customize our colonels.
-- Tux
User Friendly, 12/1/1998
msg11222/pgp00000.pgp
Description: PGP signature
