projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| fc08f4e8 GKH |
1 | From f8df5c2c3e2df5ffaf9fb5503da93d477a8c7db4 Mon Sep 17 00:00:00 2001 |
| 2 | From: Mans Rullgard <mans@mansr.com> | |
| 3 | Date: Tue, 26 Feb 2019 17:07:10 +0000 | |
| 4 | Subject: USB: serial: option: set driver_info for SIM5218 and compatibles | |
| 5 | ||
| 6 | From: Mans Rullgard <mans@mansr.com> | |
| 7 | ||
| 8 | commit f8df5c2c3e2df5ffaf9fb5503da93d477a8c7db4 upstream. | |
| 9 | ||
| 10 | The SIMCom SIM5218 and compatible devices have 5 USB interfaces, only 4 | |
| 11 | of which are serial ports. The fifth is a network interface supported | |
| 12 | by the qmi-wwan driver. Furthermore, the serial ports do not support | |
| 13 | modem control signals. Add driver_info flags to reflect this. | |
| 14 | ||
| 15 | Signed-off-by: Mans Rullgard <mans@mansr.com> | |
| 16 | Fixes: ec0cd94d881c ("usb: option: add SIMCom SIM5218") | |
| 17 | Cc: stable <stable@vger.kernel.org> # 3.2 | |
| 18 | Signed-off-by: Johan Hovold <johan@kernel.org> | |
| 19 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 20 | ||
| 21 | --- | |
| 22 | drivers/usb/serial/option.c | 3 ++- | |
| 23 | 1 file changed, 2 insertions(+), 1 deletion(-) | |
| 24 | ||
| 25 | --- a/drivers/usb/serial/option.c | |
| 26 | +++ b/drivers/usb/serial/option.c | |
| 27 | @@ -1066,7 +1066,8 @@ static const struct usb_device_id option | |
| 28 | .driver_info = RSVD(3) }, | |
| 29 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ | |
| 30 | { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */ | |
| 31 | - { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000)}, /* SIMCom SIM5218 */ | |
| 32 | + { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */ | |
| 33 | + .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) }, | |
| 34 | /* Quectel products using Qualcomm vendor ID */ | |
| 35 | { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)}, | |
| 36 | { USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20), |