.. | .. |
---|
63 | 63 | {DEVICE_G1K(0x05c6, 0x9202)}, /* Generic Gobi Modem device */ |
---|
64 | 64 | {DEVICE_G1K(0x05c6, 0x9203)}, /* Generic Gobi Modem device */ |
---|
65 | 65 | {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 */ |
---|
67 | 67 | {DEVICE_G1K(0x05c6, 0x9009)}, /* Generic Gobi Modem device */ |
---|
68 | 68 | {DEVICE_G1K(0x05c6, 0x9201)}, /* Generic Gobi QDL device */ |
---|
69 | 69 | {DEVICE_G1K(0x05c6, 0x9221)}, /* Generic Gobi QDL device */ |
---|
.. | .. |
---|
155 | 155 | {DEVICE_SWI(0x1199, 0x9056)}, /* Sierra Wireless Modem */ |
---|
156 | 156 | {DEVICE_SWI(0x1199, 0x9060)}, /* Sierra Wireless Modem */ |
---|
157 | 157 | {DEVICE_SWI(0x1199, 0x9061)}, /* Sierra Wireless Modem */ |
---|
158 | | - {DEVICE_SWI(0x1199, 0x9062)}, /* Sierra Wireless EM7305 QDL */ |
---|
159 | 158 | {DEVICE_SWI(0x1199, 0x9063)}, /* Sierra Wireless EM7305 */ |
---|
160 | 159 | {DEVICE_SWI(0x1199, 0x9070)}, /* Sierra Wireless MC74xx */ |
---|
161 | 160 | {DEVICE_SWI(0x1199, 0x9071)}, /* Sierra Wireless MC74xx */ |
---|
.. | .. |
---|
165 | 164 | {DEVICE_SWI(0x1199, 0x907b)}, /* Sierra Wireless EM74xx */ |
---|
166 | 165 | {DEVICE_SWI(0x1199, 0x9090)}, /* Sierra Wireless EM7565 QDL */ |
---|
167 | 166 | {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 */ |
---|
171 | 167 | {DEVICE_SWI(0x413c, 0x81a2)}, /* Dell Wireless 5806 Gobi(TM) 4G LTE Mobile Broadband Card */ |
---|
172 | 168 | {DEVICE_SWI(0x413c, 0x81a3)}, /* Dell Wireless 5570 HSPA+ (42Mbps) Mobile Broadband Card */ |
---|
173 | 169 | {DEVICE_SWI(0x413c, 0x81a4)}, /* Dell Wireless 5570e HSPA+ (42Mbps) Mobile Broadband Card */ |
---|
.. | .. |
---|
177 | 173 | {DEVICE_SWI(0x413c, 0x81b3)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */ |
---|
178 | 174 | {DEVICE_SWI(0x413c, 0x81b5)}, /* Dell Wireless 5811e QDL */ |
---|
179 | 175 | {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 */ |
---|
183 | 176 | {DEVICE_SWI(0x413c, 0x81cf)}, /* Dell Wireless 5819 */ |
---|
184 | 177 | {DEVICE_SWI(0x413c, 0x81d0)}, /* Dell Wireless 5819 */ |
---|
185 | 178 | {DEVICE_SWI(0x413c, 0x81d1)}, /* Dell Wireless 5818 */ |
---|
.. | .. |
---|
247 | 240 | /* QDL mode */ |
---|
248 | 241 | /* Gobi 2000 has a single altsetting, older ones have two */ |
---|
249 | 242 | if (serial->interface->num_altsetting == 2) |
---|
250 | | - intf = usb_altnum_to_altsetting(serial->interface, 1); |
---|
| 243 | + intf = &serial->interface->altsetting[1]; |
---|
251 | 244 | else if (serial->interface->num_altsetting > 2) |
---|
252 | 245 | goto done; |
---|
253 | 246 | |
---|
254 | | - if (intf && intf->desc.bNumEndpoints == 2 && |
---|
| 247 | + if (intf->desc.bNumEndpoints == 2 && |
---|
255 | 248 | usb_endpoint_is_bulk_in(&intf->endpoint[0].desc) && |
---|
256 | 249 | usb_endpoint_is_bulk_out(&intf->endpoint[1].desc)) { |
---|
257 | 250 | dev_dbg(dev, "QDL port found\n"); |
---|
.. | .. |
---|
370 | 363 | * a specific function, while the subclass indicate a |
---|
371 | 364 | * specific firmware source |
---|
372 | 365 | * |
---|
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 |
---|
375 | 369 | */ |
---|
376 | 370 | switch (intf->desc.bInterfaceProtocol) { |
---|
377 | 371 | /* QMI combined (qmi_wwan) */ |
---|