aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorDenis N Ladin <denladin@gmail.com>2012-12-26 18:29:44 +0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-17 08:44:12 -0800
commit6d9a5f52d4604191d62f51b58ab7fd2320931f53 (patch)
treeae5d0341935e658371a73ca3e1bda18234860a0b /drivers/usb
parentedce154f05d0c7e474e01c833d4c3522987fa125 (diff)
downloadkernel_samsung_smdk4412-6d9a5f52d4604191d62f51b58ab7fd2320931f53.zip
kernel_samsung_smdk4412-6d9a5f52d4604191d62f51b58ab7fd2320931f53.tar.gz
kernel_samsung_smdk4412-6d9a5f52d4604191d62f51b58ab7fd2320931f53.tar.bz2
USB: cdc-acm: Add support for "PSC Scanning, Magellan 800i"
commit 036915a7a402753c05b8d0529f5fd08805ab46d0 upstream. Adding support "PSC Scanning, Magellan 800i" in cdc-acm Very simple, but very necessary. Suitable for all versions of the kernel > 2.6 Signed-off-by: Denis N Ladin <denladin@gmail.com> Acked-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/class/cdc-acm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index b107339..84e69ea 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1509,6 +1509,9 @@ static const struct usb_device_id acm_ids[] = {
{ USB_DEVICE(0x0572, 0x1340), /* Conexant CX93010-2x UCMxx */
.driver_info = NO_UNION_NORMAL,
},
+ { USB_DEVICE(0x05f9, 0x4002), /* PSC Scanning, Magellan 800i */
+ .driver_info = NO_UNION_NORMAL,
+ },
{ USB_DEVICE(0x1bbb, 0x0003), /* Alcatel OT-I650 */
.driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */
},