On Tue, Nov 04, 2014 at 01:00:21PM +0000, Mark Knibbs wrote: > > usb_stor_euscsi_init() enables multi-target mode for SCM eUSB SCSI bridge > devices. The control message it sends has wLength = 1 and the byte sent is > 0x01. While that works, the SCM Windows driver does it with wLength = 0. We > may as well match what the SCM driver does. > > Signed-off-by: Mark Knibbs <markk@xxxxxxxxxxx> > > --- > > This includes a change from > [PATCH v2] storage: Fix timeout in usb_stor_euscsi_init() and usb_stor_huawei_e220_init() > > v3: Add spaces, 5*HZ --> 5 * HZ > v2: Remove incorrect use of USB_CTRL_SET_TIMEOUT (=5000); > usb_stor_control_msg() timeout argument is actually specified in jiffies. > > diff -up linux-3.17/drivers/usb/storage/initializers.c.orig linux-3.17/drivers/usb/storage/initializers.c > --- linux-3.17/drivers/usb/storage/initializers.c.orig 2014-10-05 20:23:04.000000000 +0100 > +++ linux-3.17/drivers/usb/storage/initializers.c 2014-10-16 13:39:04.497910732 +0100 > @@ -49,10 +49,9 @@ int usb_stor_euscsi_init(struct us_data > int result; > > usb_stor_dbg(us, "Attempting to init eUSCSI bridge...\n"); > - us->iobuf[0] = 0x1; > result = usb_stor_control_msg(us, us->send_ctrl_pipe, > 0x0C, USB_RECIP_INTERFACE | USB_TYPE_VENDOR, > - 0x01, 0x0, us->iobuf, 0x1, 5000); > + 0x01, 0x0, NULL, 0x0, 5 * HZ); > usb_stor_dbg(us, "-- result is %d\n", result); > > return 0; This doesn't apply to any of my trees, please don't include changes from other patches in a patch, as I can't apply it :( Please redo against the usb-next branch of usb.git on git.kernel.org and resend. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
