diff options
author | Johannes Steingraeber <Jo_Stein@web.de> | 2006-09-16 10:17:34 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-09-27 14:58:59 -0400 |
commit | 8fd801339350b63cbb90730ff8b2be349fb3dc67 (patch) | |
tree | 36c30093131b08446b9932f356534ac4bec6d9e9 /drivers/usb/input | |
parent | 3f5429746d91f21f60f68b14177c0d534d80240b (diff) |
usb serial: support Alcor Micro Corp. USB 2.0 TO RS-232 through pl2303 driver
Patch to add support for Alcor Micro Corp. USB 2.0 TO RS-232 converter.
This patch adds VID and PID to pl2303.[ch], adds it to the "HORRIBLE
HACK FOR PL2303" in usb-serial.c and also prevents cdc-acm to claim
driving this device by blacklisting it in hid-core.
Signed-off-by: Johannes Steingraeber <Jo_Stein@web.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/input')
-rw-r--r-- | drivers/usb/input/hid-core.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index d0d1c0c30bc5..fc5b662ea177 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
@@ -1595,6 +1595,10 @@ void hid_init_reports(struct hid_device *hid) | |||
1595 | 1595 | ||
1596 | #define USB_VENDOR_ID_YEALINK 0x6993 | 1596 | #define USB_VENDOR_ID_YEALINK 0x6993 |
1597 | #define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001 | 1597 | #define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K 0xb001 |
1598 | |||
1599 | #define USB_VENDOR_ID_ALCOR 0x058f | ||
1600 | #define USB_DEVICE_ID_ALCOR_USBRS232 0x9720 | ||
1601 | |||
1598 | /* | 1602 | /* |
1599 | * Alphabetically sorted blacklist by quirk type. | 1603 | * Alphabetically sorted blacklist by quirk type. |
1600 | */ | 1604 | */ |
@@ -1612,6 +1616,7 @@ static const struct hid_blacklist { | |||
1612 | { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_22, HID_QUIRK_IGNORE }, | 1616 | { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_22, HID_QUIRK_IGNORE }, |
1613 | { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_23, HID_QUIRK_IGNORE }, | 1617 | { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_23, HID_QUIRK_IGNORE }, |
1614 | { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24, HID_QUIRK_IGNORE }, | 1618 | { USB_VENDOR_ID_AIPTEK, USB_DEVICE_ID_AIPTEK_24, HID_QUIRK_IGNORE }, |
1619 | { USB_VENDOR_ID_ALCOR, USB_DEVICE_ID_ALCOR_USBRS232, HID_QUIRK_IGNORE }, | ||
1615 | { USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD, HID_QUIRK_IGNORE }, | 1620 | { USB_VENDOR_ID_BERKSHIRE, USB_DEVICE_ID_BERKSHIRE_PCWD, HID_QUIRK_IGNORE }, |
1616 | { USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW40, HID_QUIRK_IGNORE }, | 1621 | { USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW40, HID_QUIRK_IGNORE }, |
1617 | { USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW24, HID_QUIRK_IGNORE }, | 1622 | { USB_VENDOR_ID_CODEMERCS, USB_DEVICE_ID_CODEMERCS_IOW24, HID_QUIRK_IGNORE }, |