git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually
[safe/jmp/linux-2.6]
/
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)))
intf->altsetting->desc.bInterfaceNumber);
if (!(hid = usb_hid_configure(intf)))
- return -E
IO
;
+ return -E
NODEV
;
hid_init_reports(hid);
hid_dump_device(hid);
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);
if (!hid->claimed) {
printk ("HID device not claimed by input or hiddev\n");
hid_disconnect(intf);
- return -E
IO
;
+ return -E
NODEV
;
}
printk(KERN_INFO);
}
printk(KERN_INFO);