Messages in this thread Patch in this message |  | | Date | Tue, 16 Oct 2001 18:32:43 -0700 | From | Matthew Dharm <> | Subject | Re: [PATCH] Oops in usb-storage.c |
| |
No, I think something different is best.
Your first change to push the US_FL_FIX_INQUIRY code down after the test for pusb_dev is good.. but, in the case where that pointer is bad, we need to cook up something totally fake, like INQUIRY data that says "DISCONNECTED" "USB-STORAGE DEVICE" or somesuch.....
Matt
On Wed, Oct 17, 2001 at 03:11:13AM +0200, Jan Niehusmann wrote: > On Tue, Oct 16, 2001 at 05:56:40PM -0700, Matthew Dharm wrote: > > Actually, this is a side-effect of another problem, which is that INQUIRY > > is legal for a device at any time (at least, to SCSI). What we really need > > to do is fake an INQURIY response for detached devices, separate from also > > those devices which need a faked-inquiry all the time. > > Ok, then the fix could look like the following, I think. The INQUIRY > response in the disconnected case is a little bit different, as the > information from pusb_dev is not available, but the INQUIRY works and > the oops is fixed. > > Jan > > > --- linux-2.4.12-ac3/drivers/usb/storage/usb.c.orig Mon Oct 1 12:15:29 2001 > +++ linux-2.4.12-ac3/drivers/usb/storage/usb.c Wed Oct 17 03:04:32 2001 > @@ -268,10 +268,12 @@ > memcpy(data+16, us->unusual_dev->productName, > strlen(us->unusual_dev->productName) > 16 ? 16 : > strlen(us->unusual_dev->productName)); > - data[32] = 0x30 + ((us->pusb_dev->descriptor.bcdDevice>>12) & 0x0F); > - data[33] = 0x30 + ((us->pusb_dev->descriptor.bcdDevice>>8) & 0x0F); > - data[34] = 0x30 + ((us->pusb_dev->descriptor.bcdDevice>>4) & 0x0F); > - data[35] = 0x30 + ((us->pusb_dev->descriptor.bcdDevice) & 0x0F); > + if(us->pusb_dev) { > + data[32] = 0x30 + ((us->pusb_dev->descriptor.bcdDevice>>12) & 0x0F); > + data[33] = 0x30 + ((us->pusb_dev->descriptor.bcdDevice>>8) & 0x0F); > + data[34] = 0x30 + ((us->pusb_dev->descriptor.bcdDevice>>4) & 0x0F); > + data[35] = 0x30 + ((us->pusb_dev->descriptor.bcdDevice) & 0x0F); > + } > > if (us->srb->use_sg) { > sg = (struct scatterlist *)us->srb->request_buffer; > > > > - > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/
-- Matthew Dharm Home: mdharm-usb@one-eyed-alien.net Maintainer, Linux USB Mass Storage Driver
It's not that hard. No matter what the problem is, tell the customer to reinstall Windows. -- Nurse User Friendly, 3/22/1998 [unhandled content-type:application/pgp-signature] |  |