hc
2024-01-31 f9004dbfff8a3fbbd7e2a88c8a4327c7f2f8e5b2
kernel/drivers/usb/serial/qcserial.c
....@@ -63,7 +63,7 @@
6363 {DEVICE_G1K(0x05c6, 0x9202)}, /* Generic Gobi Modem device */
6464 {DEVICE_G1K(0x05c6, 0x9203)}, /* Generic Gobi Modem device */
6565 {DEVICE_G1K(0x05c6, 0x9222)}, /* Generic Gobi Modem device */
66
- {DEVICE_G1K(0x05c6, 0x9008)}, /* Generic Gobi QDL device */
66
+// {DEVICE_G1K(0x05c6, 0x9008)}, /* Generic Gobi QDL device */
6767 {DEVICE_G1K(0x05c6, 0x9009)}, /* Generic Gobi Modem device */
6868 {DEVICE_G1K(0x05c6, 0x9201)}, /* Generic Gobi QDL device */
6969 {DEVICE_G1K(0x05c6, 0x9221)}, /* Generic Gobi QDL device */
....@@ -155,7 +155,6 @@
155155 {DEVICE_SWI(0x1199, 0x9056)}, /* Sierra Wireless Modem */
156156 {DEVICE_SWI(0x1199, 0x9060)}, /* Sierra Wireless Modem */
157157 {DEVICE_SWI(0x1199, 0x9061)}, /* Sierra Wireless Modem */
158
- {DEVICE_SWI(0x1199, 0x9062)}, /* Sierra Wireless EM7305 QDL */
159158 {DEVICE_SWI(0x1199, 0x9063)}, /* Sierra Wireless EM7305 */
160159 {DEVICE_SWI(0x1199, 0x9070)}, /* Sierra Wireless MC74xx */
161160 {DEVICE_SWI(0x1199, 0x9071)}, /* Sierra Wireless MC74xx */
....@@ -165,9 +164,6 @@
165164 {DEVICE_SWI(0x1199, 0x907b)}, /* Sierra Wireless EM74xx */
166165 {DEVICE_SWI(0x1199, 0x9090)}, /* Sierra Wireless EM7565 QDL */
167166 {DEVICE_SWI(0x1199, 0x9091)}, /* Sierra Wireless EM7565 */
168
- {DEVICE_SWI(0x1199, 0x90d2)}, /* Sierra Wireless EM9191 QDL */
169
- {DEVICE_SWI(0x1199, 0xc080)}, /* Sierra Wireless EM7590 QDL */
170
- {DEVICE_SWI(0x1199, 0xc081)}, /* Sierra Wireless EM7590 */
171167 {DEVICE_SWI(0x413c, 0x81a2)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */
172168 {DEVICE_SWI(0x413c, 0x81a3)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */
173169 {DEVICE_SWI(0x413c, 0x81a4)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */
....@@ -177,9 +173,6 @@
177173 {DEVICE_SWI(0x413c, 0x81b3)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */
178174 {DEVICE_SWI(0x413c, 0x81b5)}, /* Dell Wireless 5811e QDL */
179175 {DEVICE_SWI(0x413c, 0x81b6)}, /* Dell Wireless 5811e QDL */
180
- {DEVICE_SWI(0x413c, 0x81c2)}, /* Dell Wireless 5811e */
181
- {DEVICE_SWI(0x413c, 0x81cb)}, /* Dell Wireless 5816e QDL */
182
- {DEVICE_SWI(0x413c, 0x81cc)}, /* Dell Wireless 5816e */
183176 {DEVICE_SWI(0x413c, 0x81cf)}, /* Dell Wireless 5819 */
184177 {DEVICE_SWI(0x413c, 0x81d0)}, /* Dell Wireless 5819 */
185178 {DEVICE_SWI(0x413c, 0x81d1)}, /* Dell Wireless 5818 */
....@@ -247,11 +240,11 @@
247240 /* QDL mode */
248241 /* Gobi 2000 has a single altsetting, older ones have two */
249242 if (serial->interface->num_altsetting == 2)
250
- intf = usb_altnum_to_altsetting(serial->interface, 1);
243
+ intf = &serial->interface->altsetting[1];
251244 else if (serial->interface->num_altsetting > 2)
252245 goto done;
253246
254
- if (intf && intf->desc.bNumEndpoints == 2 &&
247
+ if (intf->desc.bNumEndpoints == 2 &&
255248 usb_endpoint_is_bulk_in(&intf->endpoint[0].desc) &&
256249 usb_endpoint_is_bulk_out(&intf->endpoint[1].desc)) {
257250 dev_dbg(dev, "QDL port found\n");
....@@ -370,8 +363,9 @@
370363 * a specific function, while the subclass indicate a
371364 * specific firmware source
372365 *
373
- * This is a list of functions known to be non-serial. The rest
374
- * are assumed to be serial and will be handled by this driver
366
+ * This is a blacklist of functions known to be
367
+ * non-serial. The rest are assumed to be serial and
368
+ * will be handled by this driver
375369 */
376370 switch (intf->desc.bInterfaceProtocol) {
377371 /* QMI combined (qmi_wwan) */