aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/input
diff options
context:
space:
mode:
authorStelian Pop <stelian@popies.net>2005-06-22 11:53:28 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2005-06-23 02:01:09 -0400
commit479f6ea85e513551510ad52f37e69e1c596ad356 (patch)
tree60eadfd85297f42be75be8863cacbc0ea9d82f3b /drivers/usb/input
parentb7c84c6ada2be942eca6722edb2cfaad412cd5de (diff)
[PATCH] USB: fix hid core to return proper error code from probe
Drivers need to return -ENODEV when they can't bind to a device. Anything else stops the "bind a device to a driver" search. From: Stelian Pop <stelian@popies.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/input')
-rw-r--r--drivers/usb/input/hid-core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index 2d8bd9dcc6ed..740dec1f521d 100644
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1762,7 +1762,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
1762 intf->altsetting->desc.bInterfaceNumber); 1762 intf->altsetting->desc.bInterfaceNumber);
1763 1763
1764 if (!(hid = usb_hid_configure(intf))) 1764 if (!(hid = usb_hid_configure(intf)))
1765 return -EIO; 1765 return -ENODEV;
1766 1766
1767 hid_init_reports(hid); 1767 hid_init_reports(hid);
1768 hid_dump_device(hid); 1768 hid_dump_device(hid);
@@ -1777,7 +1777,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
1777 if (!hid->claimed) { 1777 if (!hid->claimed) {
1778 printk ("HID device not claimed by input or hiddev\n"); 1778 printk ("HID device not claimed by input or hiddev\n");
1779 hid_disconnect(intf); 1779 hid_disconnect(intf);
1780 return -EIO; 1780 return -ENODEV;
1781 } 1781 }
1782 1782
1783 printk(KERN_INFO); 1783 printk(KERN_INFO);