diff options
| -rw-r--r-- | drivers/usb/gadget/fsl_usb2_udc.c | 2 | ||||
| -rw-r--r-- | drivers/usb/serial/cp2101.c | 1 | ||||
| -rw-r--r-- | drivers/usb/serial/sierra.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/drivers/usb/gadget/fsl_usb2_udc.c b/drivers/usb/gadget/fsl_usb2_udc.c index 9bb7f64a85cd..038e7d7b4da1 100644 --- a/drivers/usb/gadget/fsl_usb2_udc.c +++ b/drivers/usb/gadget/fsl_usb2_udc.c | |||
| @@ -1318,7 +1318,7 @@ static void setup_received_irq(struct fsl_udc *udc, | |||
| 1318 | | USB_TYPE_STANDARD)) { | 1318 | | USB_TYPE_STANDARD)) { |
| 1319 | /* Note: The driver has not include OTG support yet. | 1319 | /* Note: The driver has not include OTG support yet. |
| 1320 | * This will be set when OTG support is added */ | 1320 | * This will be set when OTG support is added */ |
| 1321 | if (!gadget_is_otg(udc->gadget)) | 1321 | if (!gadget_is_otg(&udc->gadget)) |
| 1322 | break; | 1322 | break; |
| 1323 | else if (setup->bRequest == USB_DEVICE_B_HNP_ENABLE) | 1323 | else if (setup->bRequest == USB_DEVICE_B_HNP_ENABLE) |
| 1324 | udc->gadget.b_hnp_enable = 1; | 1324 | udc->gadget.b_hnp_enable = 1; |
diff --git a/drivers/usb/serial/cp2101.c b/drivers/usb/serial/cp2101.c index da16b5157816..22833589c4be 100644 --- a/drivers/usb/serial/cp2101.c +++ b/drivers/usb/serial/cp2101.c | |||
| @@ -55,6 +55,7 @@ static int debug; | |||
| 55 | static struct usb_device_id id_table [] = { | 55 | static struct usb_device_id id_table [] = { |
| 56 | { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ | 56 | { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ |
| 57 | { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */ | 57 | { USB_DEVICE(0x0FCF, 0x1003) }, /* Dynastream ANT development board */ |
| 58 | { USB_DEVICE(0x0FCF, 0x1004) }, /* Dynastream ANT2USB */ | ||
| 58 | { USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */ | 59 | { USB_DEVICE(0x10A6, 0xAA26) }, /* Knock-off DCU-11 cable */ |
| 59 | { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */ | 60 | { USB_DEVICE(0x10AB, 0x10C5) }, /* Siemens MC60 Cable */ |
| 60 | { USB_DEVICE(0x10B5, 0xAC70) }, /* Nokia CA-42 USB */ | 61 | { USB_DEVICE(0x10B5, 0xAC70) }, /* Nokia CA-42 USB */ |
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index e5c274044a5f..c295d0495f96 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c | |||
| @@ -109,6 +109,7 @@ static struct usb_device_id id_table [] = { | |||
| 109 | { USB_DEVICE(0x1199, 0x6804) }, /* Sierra Wireless MC8755 */ | 109 | { USB_DEVICE(0x1199, 0x6804) }, /* Sierra Wireless MC8755 */ |
| 110 | { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */ | 110 | { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */ |
| 111 | { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 & AC 875U */ | 111 | { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 & AC 875U */ |
| 112 | { USB_DEVICE(0x1199, 0x6813) }, /* Sierra Wireless MC8775 (Thinkpad internal) */ | ||
| 112 | { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */ | 113 | { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */ |
| 113 | { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780*/ | 114 | { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780*/ |
| 114 | { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781*/ | 115 | { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781*/ |
| @@ -146,6 +147,7 @@ static struct usb_device_id id_table_3port [] = { | |||
| 146 | { USB_DEVICE(0x1199, 0x6804) }, /* Sierra Wireless MC8755 */ | 147 | { USB_DEVICE(0x1199, 0x6804) }, /* Sierra Wireless MC8755 */ |
| 147 | { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */ | 148 | { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */ |
| 148 | { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 & AC 875U */ | 149 | { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 & AC 875U */ |
| 150 | { USB_DEVICE(0x1199, 0x6813) }, /* Sierra Wireless MC8775 (Thinkpad internal) */ | ||
| 149 | { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */ | 151 | { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */ |
| 150 | { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780*/ | 152 | { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780*/ |
| 151 | { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781*/ | 153 | { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781*/ |
