summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorToby Gray <toby.gray@realvnc.com>2011-06-06 14:52:48 +0100
committerAndi Kleen <ak@linux.intel.com>2011-08-01 13:54:55 -0700
commit1533b3eed5c2f38caa7a813163ff1f27264077bb (patch)
tree25e75876f88081b54aacf6979c8b265fbdadd92f /drivers
parent5d8e9bd2745ac9212f5a899471f46bfed2749d42 (diff)
downloadlinux-1533b3eed5c2f38caa7a813163ff1f27264077bb.tar.gz
linux-1533b3eed5c2f38caa7a813163ff1f27264077bb.tar.bz2
linux-1533b3eed5c2f38caa7a813163ff1f27264077bb.zip
USB: cdc-acm: Adding second ACM channel support for Nokia E7 and C7
commit 4061fde2fa80f40cb27114f60500d38d0afcf350 upstream. This adds the Nokia E7 and C7 to the list of devices in cdc-acm, allowing the secondary ACM channel on the device to be exposed. Without this patch the ACM driver won't claim this secondary channel as it's marked as having a vendor-specific protocol. Signed-off-by: Toby Gray <toby.gray@realvnc.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Andi Kleen <ak@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/class/cdc-acm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 2c70e1e6aa93..851dfb026dcf 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1619,6 +1619,8 @@ static const struct usb_device_id acm_ids[] = {
{ NOKIA_PCSUITE_ACM_INFO(0x04ce), }, /* Nokia E90 */
{ NOKIA_PCSUITE_ACM_INFO(0x01d4), }, /* Nokia E55 */
{ NOKIA_PCSUITE_ACM_INFO(0x0302), }, /* Nokia N8 */
+ { NOKIA_PCSUITE_ACM_INFO(0x0335), }, /* Nokia E7 */
+ { NOKIA_PCSUITE_ACM_INFO(0x03cd), }, /* Nokia C7 */
{ SAMSUNG_PCSUITE_ACM_INFO(0x6651), }, /* Samsung GTi8510 (INNOV8) */
/* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */