Commit be326f4c authored by Hans de Goede's avatar Hans de Goede Committed by Sarah Sharp

uas: Fix reset locking

Fix the uas_eh_bus_reset_handler not properly taking the usbdev lock
before calling usb_device_reset, the usb-core expects this lock to be
taken when usb_device_reset is called.
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent 6c2334e9
...@@ -804,6 +804,13 @@ static int uas_eh_bus_reset_handler(struct scsi_cmnd *cmnd) ...@@ -804,6 +804,13 @@ static int uas_eh_bus_reset_handler(struct scsi_cmnd *cmnd)
struct usb_device *udev = devinfo->udev; struct usb_device *udev = devinfo->udev;
int err; int err;
err = usb_lock_device_for_reset(udev, devinfo->intf);
if (err) {
shost_printk(KERN_ERR, sdev->host,
"%s FAILED to get lock err %d\n", __func__, err);
return FAILED;
}
shost_printk(KERN_INFO, sdev->host, "%s start\n", __func__); shost_printk(KERN_INFO, sdev->host, "%s start\n", __func__);
devinfo->resetting = 1; devinfo->resetting = 1;
uas_abort_work(devinfo); uas_abort_work(devinfo);
...@@ -817,6 +824,8 @@ static int uas_eh_bus_reset_handler(struct scsi_cmnd *cmnd) ...@@ -817,6 +824,8 @@ static int uas_eh_bus_reset_handler(struct scsi_cmnd *cmnd)
uas_configure_endpoints(devinfo); uas_configure_endpoints(devinfo);
devinfo->resetting = 0; devinfo->resetting = 0;
usb_unlock_device(udev);
if (err) { if (err) {
shost_printk(KERN_INFO, sdev->host, "%s FAILED\n", __func__); shost_printk(KERN_INFO, sdev->host, "%s FAILED\n", __func__);
return FAILED; return FAILED;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment