summaryrefslogtreecommitdiffstats
path: root/drivers/usb/usbmouse.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2000-02-18 00:24:27 +0000
committerRalf Baechle <ralf@linux-mips.org>2000-02-18 00:24:27 +0000
commitb9558d5f86c471a125abf1fb3a3882fb053b1f8c (patch)
tree707b53ec64e740a7da87d5f36485e3cd9b1c794e /drivers/usb/usbmouse.c
parentb3ac367c7a3e6047abe74817db27e34e759f279f (diff)
Merge with Linux 2.3.41.
Diffstat (limited to 'drivers/usb/usbmouse.c')
-rw-r--r--drivers/usb/usbmouse.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/usb/usbmouse.c b/drivers/usb/usbmouse.c
index e4145d095..7276ca670 100644
--- a/drivers/usb/usbmouse.c
+++ b/drivers/usb/usbmouse.c
@@ -83,8 +83,9 @@ static void *usb_mouse_probe(struct usb_device *dev, unsigned int ifnum)
if ((endpoint->bmAttributes & 3) != 3) return NULL;
#ifndef USBMOUSE_EXTRA
- usb_set_protocol(dev, 0);
+ usb_set_protocol(dev, interface->bInterfaceNumber, 0);
#endif
+ usb_set_idle(dev, interface->bInterfaceNumber, 0, 0);
if (!(mouse = kmalloc(sizeof(struct usb_mouse), GFP_KERNEL))) return NULL;
memset(mouse, 0, sizeof(struct usb_mouse));