Skip to content

Commit

Permalink
USB: HID: add blacklist AIRcable USB, little beautification
Browse files Browse the repository at this point in the history
This patch add AIRcable USBto USB-HID blacklist, makes some little
changes things in the Kconfig to make AIRcable USB look as all the rest
of drivers. And it removes the readme part that was on
Documentation/usb/usb-serial.txt because it is not needed anymore.


Signed-off-by: Naranjo Manuel Francisco <naranjo.manuel@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Naranjo Manuel Francisco authored and Greg Kroah-Hartman committed Nov 3, 2006
1 parent 5a69ebe commit 23b0d96
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 8 deletions.
6 changes: 0 additions & 6 deletions Documentation/usb/usb-serial.txt
Original file line number Diff line number Diff line change
Expand Up @@ -428,12 +428,6 @@ Options supported:
See http://www.uuhaus.de/linux/palmconnect.html for up-to-date
information on this driver.

AIRcable USB Dongle Bluetooth driver
If there is the cdc_acm driver loaded in the system, you will find that the
cdc_acm claims the device before AIRcable can. This is simply corrected
by unloading both modules and then loading the aircable module before
cdc_acm module

Generic Serial driver

If your device is not one of the above listed devices, compatible with
Expand Down
4 changes: 4 additions & 0 deletions drivers/usb/input/hid-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1640,6 +1640,9 @@ void hid_init_reports(struct hid_device *hid)
#define USB_VENDOR_ID_SUN 0x0430
#define USB_DEVICE_ID_RARITAN_KVM_DONGLE 0xcdab

#define USB_VENDOR_ID_AIRCABLE 0x16CA
#define USB_DEVICE_ID_AIRCABLE1 0x1502

/*
* Alphabetically sorted blacklist by quirk type.
*/
Expand All @@ -1657,6 +1660,7 @@ static const struct hid_blacklist {
{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_22, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_23, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_AIRCABLE, USB_DEVICE_ID_AIRCABLE1, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD, HID_QUIRK_IGNORE },
{ USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW40, HID_QUIRK_IGNORE },
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/serial/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ config USB_SERIAL_GENERIC
properly.

config USB_SERIAL_AIRCABLE
tristate "AIRcable USB Bluetooth Dongle Driver (EXPERIMENTAL)"
tristate "USB AIRcable Bluetooth Dongle Driver (EXPERIMENTAL)"
depends on USB_SERIAL && EXPERIMENTAL
help
Say Y here if you want to use AIRcable USB Bluetoot Dongle.
Say Y here if you want to use USB AIRcable Bluetooth Dongle.

To compile this driver as a module, choose M here: the module
will be called aircable.
Expand Down

0 comments on commit 23b0d96

Please sign in to comment.