diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 15:22:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-13 15:22:54 -0700 |
| commit | e17f8af316525c2a795bb314dfcc23201fb51ef4 (patch) | |
| tree | 99ea9c56dc9e8fc6485d0513e71aacdb50a19792 /drivers/usb/class/cdc-wdm.c | |
| parent | a276400d14bb5b98a5db1d87bbee7b1621abe4a1 (diff) | |
| parent | 0b84704a2d6fdf55a3dcdd2a1f2ac8b48913c84b (diff) | |
| download | linux-stable-e17f8af316525c2a795bb314dfcc23201fb51ef4.tar.gz linux-stable-e17f8af316525c2a795bb314dfcc23201fb51ef4.tar.bz2 linux-stable-e17f8af316525c2a795bb314dfcc23201fb51ef4.zip | |
Merge branch 'usb-linus' into usb-next
This is to pick up the changes to the option driver, which are needed
for follow-on patches from Johan.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/class/cdc-wdm.c')
| -rw-r--r-- | drivers/usb/class/cdc-wdm.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c index ea8b304f0e85..8fd398dffced 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c @@ -55,6 +55,15 @@ static const struct usb_device_id wdm_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = 9, /* NOTE: CDC ECM control interface! */ }, + { + /* Vodafone/Huawei K5005 (12d1:14c8) and similar modems */ + .match_flags = USB_DEVICE_ID_MATCH_VENDOR | + USB_DEVICE_ID_MATCH_INT_INFO, + .idVendor = HUAWEI_VENDOR_ID, + .bInterfaceClass = USB_CLASS_VENDOR_SPEC, + .bInterfaceSubClass = 1, + .bInterfaceProtocol = 57, /* NOTE: CDC ECM control interface! */ + }, { } }; |