Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually

[pandora-kernel.git] / drivers / usb / input / hid-core.c

diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c
index d88e588..100b49b 100644 (file)
--- a/drivers/usb/input/hid-core.c
+++ b/drivers/usb/input/hid-core.c
@@ -1774,7 +1774,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
                        intf->altsetting->desc.bInterfaceNumber);
 
        if (!(hid = usb_hid_configure(intf)))
-               return -EIO;
+               return -ENODEV;
 
        hid_init_reports(hid);
        hid_dump_device(hid);
@@ -1789,7 +1789,7 @@ static int hid_probe(struct usb_interface *intf, const struct usb_device_id *id)
        if (!hid->claimed) {
                printk ("HID device not claimed by input or hiddev\n");
                hid_disconnect(intf);
-               return -EIO;
+               return -ENODEV;
        }
 
        printk(KERN_INFO);