aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/class
diff options
context:
space:
mode:
authorDenis N Ladin <denladin@gmail.com>2012-12-26 18:29:44 +0500
committerBen Hutchings <ben@decadent.org.uk>2013-02-06 04:33:30 +0000
commit011321db1cb95b2c8917c280c151b6b89bd6b8c6 (patch)
tree5572821bef5c38e80c2b5e227d0e992a0d0c10ee /drivers/usb/class
parent5d0afa58e6045b69de6e9e7dfe23ae35279b4dd4 (diff)
downloadkernel_samsung_smdk4412-011321db1cb95b2c8917c280c151b6b89bd6b8c6.zip
kernel_samsung_smdk4412-011321db1cb95b2c8917c280c151b6b89bd6b8c6.tar.gz
kernel_samsung_smdk4412-011321db1cb95b2c8917c280c151b6b89bd6b8c6.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> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/class')
-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 df7f15d..0cdff38 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 */
},