| From 0cc6bfe901b946df125d8e37186d8e45f876457d Mon Sep 17 00:00:00 2001 |
| From: Dan Williams <dcbw@redhat.com> |
| Date: Thu, 12 Mar 2009 06:53:00 -0400 |
| Subject: USB: Option: let cdc-acm handle Sony Ericsson F3507g / Dell 5530 |
| |
| From: Dan Williams <dcbw@redhat.com> |
| |
| commit 0cc6bfe901b946df125d8e37186d8e45f876457d upstream. |
| |
| The generic cdc-acm driver is now the best one to handle Sony Ericsson |
| F3507g-based devices (which the Dell 5530 is a rebrand of), now that all |
| the pieces are in place (ie, cac477e8f1038c41b6f29d3161ce351462ef3df7). |
| Removing the IDs from option allows cdc-acm to handle the device. |
| |
| Signed-off-by: Dan Williams <dcbw@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| drivers/usb/serial/option.c | 6 ------ |
| 1 file changed, 6 deletions(-) |
| |
| --- a/drivers/usb/serial/option.c |
| +++ b/drivers/usb/serial/option.c |
| @@ -288,10 +288,6 @@ static int option_send_setup(struct tty |
| #define ZTE_PRODUCT_MF626 0x0031 |
| #define ZTE_PRODUCT_CDMA_TECH 0xfffe |
| |
| -/* Ericsson products */ |
| -#define ERICSSON_VENDOR_ID 0x0bdb |
| -#define ERICSSON_PRODUCT_F3507G 0x1900 |
| - |
| #define BENQ_VENDOR_ID 0x04a5 |
| #define BENQ_PRODUCT_H10 0x4068 |
| |
| @@ -434,7 +430,6 @@ static struct usb_device_id option_ids[] |
| { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_CINGULAR) }, /* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */ |
| { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_L) }, /* Dell Wireless HSDPA 5520 */ |
| { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_I) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */ |
| - { USB_DEVICE(DELL_VENDOR_ID, 0x8147) }, /* Dell Wireless 5530 Mobile Broadband (3G HSPA) Mini-Card */ |
| { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_SPRINT) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ |
| { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_TELUS) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ |
| { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_VZW) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ |
| @@ -506,7 +501,6 @@ static struct usb_device_id option_ids[] |
| { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626) }, |
| { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) }, |
| { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) }, |
| - { USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G) }, |
| { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) }, |
| { USB_DEVICE(0x1da5, 0x4515) }, /* BenQ H20 */ |
| { } /* Terminating entry */ |
