diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-13 08:43:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-13 08:43:38 -0700 |
| commit | 19299b1a722198830e39264a0f2edadd3fde74c2 (patch) | |
| tree | 987d546dd5fb9c278e9fa908c81e1e7699f0033f /drivers/usb/storage/scsiglue.c | |
| parent | f3da54ba140c6427fa4a32913e1bf406f41b5dda (diff) | |
| parent | d526875deb42e0f4c0d31cb50b4e5bfaf19c3138 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6:
Revert "usb-storage: implement autosuspend"
USB: disable autosuspend by default for non-hubs
Diffstat (limited to 'drivers/usb/storage/scsiglue.c')
| -rw-r--r-- | drivers/usb/storage/scsiglue.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 47e56079925..1ba19eaa197 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c @@ -285,15 +285,10 @@ static int device_reset(struct scsi_cmnd *srb) US_DEBUGP("%s called\n", __FUNCTION__); - result = usb_autopm_get_interface(us->pusb_intf); - if (result == 0) { - - /* lock the device pointers and do the reset */ - mutex_lock(&(us->dev_mutex)); - result = us->transport_reset(us); - mutex_unlock(&us->dev_mutex); - usb_autopm_put_interface(us->pusb_intf); - } + /* lock the device pointers and do the reset */ + mutex_lock(&(us->dev_mutex)); + result = us->transport_reset(us); + mutex_unlock(&us->dev_mutex); return result < 0 ? FAILED : SUCCESS; } |