]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
V4L/DVB (9337a): HID: Don't allow KWorld radio fm700 be handled by usb hid drivers
authorAlexey Klimov <klimov.linux@gmail.com>
Sun, 19 Oct 2008 23:10:13 +0000 (20:10 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 11 Nov 2008 10:09:43 +0000 (08:09 -0200)
This device is already handled by radio-si470x driver, and we
therefore want usbhid to ignore it.

Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
Acked-by: Tobias Lorenz <tobias.lorenz@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/hid/hid-core.c
drivers/hid/hid-ids.h

index 1903e7515650df961f3c23ea82c43d499808fbe2..d3671b4049c0ef4077f1cb68e2e38e8c27c198be 100644 (file)
@@ -1265,6 +1265,7 @@ static const struct hid_device_id hid_blacklist[] = {
        { HID_USB_DEVICE(USB_VENDOR_ID_EZKEY, USB_DEVICE_ID_BTC_8193) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GENERIC_13BA, USB_DEVICE_ID_GENERIC_13BA_KBD_MOUSE) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE) },
+       { HID_USB_DEVICE(USB_VENDOR_ID_KWORLD, USB_DEVICE_ID_KWORLD_RADIO_FM700) },
        { HID_USB_DEVICE(USB_VENDOR_ID_GYRATION, USB_DEVICE_ID_GYRATION_REMOTE_2) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LABTEC, USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD) },
        { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_MX3000_RECEIVER) },
index 5cc40429173659d05df493b17a64d9b4f163a46f..f05bcbbbb0d5457e060c37852b57fdfba486d12f 100644 (file)
 #define USB_VENDOR_ID_KBGEAR           0x084e
 #define USB_DEVICE_ID_KBGEAR_JAMSTUDIO 0x1001
 
+#define USB_VENDOR_ID_KWORLD           0x1b80
+#define USB_DEVICE_ID_KWORLD_RADIO_FM700       0xd700
+
 #define USB_VENDOR_ID_LABTEC           0x1020
 #define USB_DEVICE_ID_LABTEC_WIRELESS_KEYBOARD 0x0006