diff options
author | Alan Stern <stern@rowland.harvard.edu> | 2006-06-01 13:52:56 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-21 18:04:15 -0400 |
commit | 47104b0dd32cec467574822b0dc3517b3de3f0ad (patch) | |
tree | 7cc1a012b3351275249c15fbdfc608a1774762b4 /drivers/usb/storage/scsiglue.c | |
parent | 7de18d8bf4b470752e799e219b38b6dff4b49993 (diff) |
[PATCH] usb-storage: use usb_reset_composite_device
This patch (as701) modifies usb-storage to take advantage of the new
usb_reset_composite_device() API. Now we will be able to safely request
port resets even if other drivers are bound to a mass-storage device.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage/scsiglue.c')
-rw-r--r-- | drivers/usb/storage/scsiglue.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 5f11e19eaae3..5715291ba540 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c | |||
@@ -286,11 +286,7 @@ static int bus_reset(struct scsi_cmnd *srb) | |||
286 | int result; | 286 | int result; |
287 | 287 | ||
288 | US_DEBUGP("%s called\n", __FUNCTION__); | 288 | US_DEBUGP("%s called\n", __FUNCTION__); |
289 | |||
290 | mutex_lock(&(us->dev_mutex)); | ||
291 | result = usb_stor_port_reset(us); | 289 | result = usb_stor_port_reset(us); |
292 | mutex_unlock(&us->dev_mutex); | ||
293 | |||
294 | return result < 0 ? FAILED : SUCCESS; | 290 | return result < 0 ? FAILED : SUCCESS; |
295 | } | 291 | } |
296 | 292 | ||