summaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/transport.c
diff options
context:
space:
mode:
authorMing Lei <tom.leiming@gmail.com>2008-06-18 22:00:29 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-21 15:16:33 -0700
commit742120c63138651c898614001cb58cd607401eac (patch)
tree3aeeb95b66773ee60839c651a10d295117d87e88 /drivers/usb/storage/transport.c
parentdd9ca5d9be7eba99d685d733e23d5be7110e9556 (diff)
downloadop-kernel-dev-742120c63138651c898614001cb58cd607401eac.zip
op-kernel-dev-742120c63138651c898614001cb58cd607401eac.tar.gz
USB: fix usb_reset_device and usb_reset_composite_device(take 3)
This patch renames the existing usb_reset_device in hub.c to usb_reset_and_verify_device and renames the existing usb_reset_composite_device to usb_reset_device. Also the new usb_reset_and_verify_device does't need to be EXPORTED . The idea of the patch is that external interface driver should warn the other interfaces' driver of the same device before and after reseting the usb device. One interface driver shoud call _old_ usb_reset_composite_device instead of _old_ usb_reset_device since it can't assume the device contains only one interface. The _old_ usb_reset_composite_device is safe for single interface device also. we rename the two functions to make the change easily. This patch is under guideline from Alan Stern. Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Diffstat (limited to 'drivers/usb/storage/transport.c')
-rw-r--r--drivers/usb/storage/transport.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c
index 670e4cb..fcbbfdb 100644
--- a/drivers/usb/storage/transport.c
+++ b/drivers/usb/storage/transport.c
@@ -1172,8 +1172,8 @@ int usb_stor_port_reset(struct us_data *us)
result = -EIO;
US_DEBUGP("No reset during disconnect\n");
} else {
- result = usb_reset_composite_device(us->pusb_dev);
- US_DEBUGP("usb_reset_composite_device returns %d\n",
+ result = usb_reset_device(us->pusb_dev);
+ US_DEBUGP("usb_reset_device returns %d\n",
result);
}
if (rc_lock)
OpenPOWER on IntegriCloud