projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| 52b9c7ae GKH |
1 | From d1252f0237238b912c3e7a51bf237acf34c97983 Mon Sep 17 00:00:00 2001 |
| 2 | From: Kristian Evensen <kristian.evensen@gmail.com> | |
| 3 | Date: Sat, 2 Mar 2019 13:35:53 +0100 | |
| 4 | Subject: USB: serial: option: add support for Quectel EM12 | |
| 5 | ||
| 6 | From: Kristian Evensen <kristian.evensen@gmail.com> | |
| 7 | ||
| 8 | commit d1252f0237238b912c3e7a51bf237acf34c97983 upstream. | |
| 9 | ||
| 10 | The Quectel EM12 is a Cat. 12 LTE modem. It behaves in the exactly the | |
| 11 | same way as the EP06 (including the dynamic configuration behavior), so | |
| 12 | the same checks on reserved interfaces, etc. are needed. | |
| 13 | ||
| 14 | Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com> | |
| 15 | Cc: stable <stable@vger.kernel.org> | |
| 16 | Signed-off-by: Johan Hovold <johan@kernel.org> | |
| 17 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 18 | ||
| 19 | --- | |
| 20 | drivers/usb/serial/option.c | 4 ++++ | |
| 21 | 1 file changed, 4 insertions(+) | |
| 22 | ||
| 23 | --- a/drivers/usb/serial/option.c | |
| 24 | +++ b/drivers/usb/serial/option.c | |
| 25 | @@ -246,6 +246,7 @@ static void option_instat_callback(struc | |
| 26 | #define QUECTEL_PRODUCT_EC25 0x0125 | |
| 27 | #define QUECTEL_PRODUCT_BG96 0x0296 | |
| 28 | #define QUECTEL_PRODUCT_EP06 0x0306 | |
| 29 | +#define QUECTEL_PRODUCT_EM12 0x0512 | |
| 30 | ||
| 31 | #define CMOTECH_VENDOR_ID 0x16d8 | |
| 32 | #define CMOTECH_PRODUCT_6001 0x6001 | |
| 33 | @@ -1088,6 +1089,9 @@ static const struct usb_device_id option | |
| 34 | { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff), | |
| 35 | .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 }, | |
| 36 | { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0, 0) }, | |
| 37 | + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0xff, 0xff), | |
| 38 | + .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 }, | |
| 39 | + { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0, 0) }, | |
| 40 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) }, | |
| 41 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) }, | |
| 42 | { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003), |