diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-09-13 15:01:24 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-09-13 15:01:24 +0200 |
| commit | d526875deb42e0f4c0d31cb50b4e5bfaf19c3138 (patch) | |
| tree | dc1663e05af27746e7056f0624accbcb96aaa661 /drivers/usb/storage/scsiglue.c | |
| parent | USB: disable autosuspend by default for non-hubs (diff) | |
| download | linux-d526875deb42e0f4c0d31cb50b4e5bfaf19c3138.tar.xz linux-d526875deb42e0f4c0d31cb50b4e5bfaf19c3138.zip | |
Revert "usb-storage: implement autosuspend"
This reverts commit 8dfe4b14869fd185ca25ee88b02ada58a3005eaf.
There are a number of issues still remaining in usb-storage autosuspend,
so, to be safe, we need to revert this for now.
Acked-by: Oliver Neukum <oneukum@suse.de>
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 | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 47e56079925d..1ba19eaa1970 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; } |