diff options
author | Ming Lei <tom.leiming@gmail.com> | 2008-06-14 21:42:02 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-21 18:16:32 -0400 |
commit | 625f694936cbbdee98e6cc65f72724a7660e7946 (patch) | |
tree | a802abcee5ef4d1e24409a615af8c97843f639e5 /drivers/hid | |
parent | 33578bd706e40eb877bd87bfc47e5da30034afde (diff) |
USB: remove interface parameter of usb_reset_composite_device
From the current implementation of usb_reset_composite_device
function, the iface parameter is no longer useful. This function
doesn't do something special for the iface usb_interface,compared
with other interfaces in the usb_device. So remove the parameter
and fix the related caller.
Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/hid')
-rw-r--r-- | drivers/hid/usbhid/hid-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index 01427c51c7cc..69fa79b6b51c 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c | |||
@@ -122,7 +122,7 @@ static void hid_reset(struct work_struct *work) | |||
122 | dev_dbg(&usbhid->intf->dev, "resetting device\n"); | 122 | dev_dbg(&usbhid->intf->dev, "resetting device\n"); |
123 | rc = rc_lock = usb_lock_device_for_reset(hid_to_usb_dev(hid), usbhid->intf); | 123 | rc = rc_lock = usb_lock_device_for_reset(hid_to_usb_dev(hid), usbhid->intf); |
124 | if (rc_lock >= 0) { | 124 | if (rc_lock >= 0) { |
125 | rc = usb_reset_composite_device(hid_to_usb_dev(hid), usbhid->intf); | 125 | rc = usb_reset_composite_device(hid_to_usb_dev(hid)); |
126 | if (rc_lock) | 126 | if (rc_lock) |
127 | usb_unlock_device(hid_to_usb_dev(hid)); | 127 | usb_unlock_device(hid_to_usb_dev(hid)); |
128 | } | 128 | } |