aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2007-12-17 10:11:27 -0500
committerJiri Kosina <jkosina@suse.cz>2008-01-28 08:51:22 -0500
commitb0e668240949f69e84d69f998aa9af759e8be635 (patch)
treea7996185476792af5fb9829b6e78a1d0a856eb45
parent15b55fb879e901bbc0da05054b14ccbc2752a56a (diff)
HID: fix compilation of hidbp drivers without usbhid
We can use the blacklist only if usbhid code is compiled. Reported-by: jurriaan <thunder7@xs4all.nl> Cc: Pascal Terjan <pterjan@mandriva.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/hid/usbhid/usbkbd.c2
-rw-r--r--drivers/hid/usbhid/usbmouse.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/usbhid/usbkbd.c b/drivers/hid/usbhid/usbkbd.c
index a31ccb4fca09..5d9dbb47e4a8 100644
--- a/drivers/hid/usbhid/usbkbd.c
+++ b/drivers/hid/usbhid/usbkbd.c
@@ -235,11 +235,13 @@ static int usb_kbd_probe(struct usb_interface *iface,
235 if (!usb_endpoint_is_int_in(endpoint)) 235 if (!usb_endpoint_is_int_in(endpoint))
236 return -ENODEV; 236 return -ENODEV;
237 237
238#ifdef CONFIG_USB_HID
238 if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor), 239 if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
239 le16_to_cpu(dev->descriptor.idProduct)) 240 le16_to_cpu(dev->descriptor.idProduct))
240 & HID_QUIRK_IGNORE) { 241 & HID_QUIRK_IGNORE) {
241 return -ENODEV; 242 return -ENODEV;
242 } 243 }
244#endif
243 245
244 pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress); 246 pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
245 maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe)); 247 maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));
diff --git a/drivers/hid/usbhid/usbmouse.c b/drivers/hid/usbhid/usbmouse.c
index 8ff1b3fe8d6d..df0d96d989de 100644
--- a/drivers/hid/usbhid/usbmouse.c
+++ b/drivers/hid/usbhid/usbmouse.c
@@ -131,11 +131,13 @@ static int usb_mouse_probe(struct usb_interface *intf, const struct usb_device_i
131 if (!usb_endpoint_is_int_in(endpoint)) 131 if (!usb_endpoint_is_int_in(endpoint))
132 return -ENODEV; 132 return -ENODEV;
133 133
134#ifdef CONFIG_USB_HID
134 if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor), 135 if (usbhid_lookup_quirk(le16_to_cpu(dev->descriptor.idVendor),
135 le16_to_cpu(dev->descriptor.idProduct)) 136 le16_to_cpu(dev->descriptor.idProduct))
136 & (HID_QUIRK_IGNORE|HID_QUIRK_IGNORE_MOUSE)) { 137 & (HID_QUIRK_IGNORE|HID_QUIRK_IGNORE_MOUSE)) {
137 return -ENODEV; 138 return -ENODEV;
138 } 139 }
140#endif
139 141
140 pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress); 142 pipe = usb_rcvintpipe(dev, endpoint->bEndpointAddress);
141 maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe)); 143 maxp = usb_maxpacket(dev, pipe, usb_pipeout(pipe));