From 6a0de29784c4b663575df8bf965d07f9881a5672 Mon Sep 17 00:00:00 2001 From: Russ Nelson Date: Wed, 21 Apr 2010 23:07:03 -0400 Subject: [PATCH] --- yaml --- r: 190453 b: refs/heads/master c: c3baa19b0a9b711b02cec81d9fea33b7b9628957 h: refs/heads/master i: 190451: 9b34730a8ea6515f00a41fe3cb9c53af24807460 v: v3 --- [refs] | 2 +- trunk/drivers/usb/class/cdc-acm.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index dfa0a2d43654..ae842fda58a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa7fe7af146a7b613e36a311eefbbfb5555325d1 +refs/heads/master: c3baa19b0a9b711b02cec81d9fea33b7b9628957 diff --git a/trunk/drivers/usb/class/cdc-acm.c b/trunk/drivers/usb/class/cdc-acm.c index be6331e2c276..5e1a253b08a0 100644 --- a/trunk/drivers/usb/class/cdc-acm.c +++ b/trunk/drivers/usb/class/cdc-acm.c @@ -1542,6 +1542,9 @@ static const struct usb_device_id acm_ids[] = { { USB_DEVICE(0x1bbb, 0x0003), /* Alcatel OT-I650 */ .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ }, + { USB_DEVICE(0x1576, 0x03b1), /* Maretron USB100 */ + .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ + }, /* Nokia S60 phones expose two ACM channels. The first is * a modem and is picked up by the standard AT-command