Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
USB: remove broken usb-serial num_endpoints check
USB: option: Add new vendor ID and device ID for AMOI HSDPA modem
USB: support more Huawei data card product IDs
USB: option.c: add more device IDs
USB: Obscure Maxon BP3-USB Device Support 16d8:6280 for option driver
+148
-6
+54
-2
drivers/usb/serial/option.c
+54
-2
drivers/usb/serial/option.c
···
109
109
#define HUAWEI_PRODUCT_E600 0x1001
110
110
#define HUAWEI_PRODUCT_E220 0x1003
111
111
#define HUAWEI_PRODUCT_E220BIS 0x1004
112
+
#define HUAWEI_PRODUCT_E1401 0x1401
113
+
#define HUAWEI_PRODUCT_E1403 0x1403
114
+
#define HUAWEI_PRODUCT_E1405 0x1405
115
+
#define HUAWEI_PRODUCT_E1406 0x1406
116
+
#define HUAWEI_PRODUCT_E1408 0x1408
117
+
#define HUAWEI_PRODUCT_E1409 0x1409
118
+
#define HUAWEI_PRODUCT_E1410 0x1410
119
+
#define HUAWEI_PRODUCT_E1411 0x1411
120
+
#define HUAWEI_PRODUCT_E1412 0x1412
121
+
#define HUAWEI_PRODUCT_E1413 0x1413
122
+
#define HUAWEI_PRODUCT_E1414 0x1414
123
+
#define HUAWEI_PRODUCT_E1415 0x1415
124
+
#define HUAWEI_PRODUCT_E1416 0x1416
125
+
#define HUAWEI_PRODUCT_E1417 0x1417
126
+
#define HUAWEI_PRODUCT_E1418 0x1418
127
+
#define HUAWEI_PRODUCT_E1419 0x1419
112
128
113
129
#define NOVATELWIRELESS_VENDOR_ID 0x1410
114
130
···
145
129
#define NOVATELWIRELESS_PRODUCT_EV620 0x2100
146
130
#define NOVATELWIRELESS_PRODUCT_ES720 0x2110
147
131
#define NOVATELWIRELESS_PRODUCT_E725 0x2120
132
+
#define NOVATELWIRELESS_PRODUCT_ES620 0x2130
148
133
#define NOVATELWIRELESS_PRODUCT_EU730 0x2400
149
134
#define NOVATELWIRELESS_PRODUCT_EU740 0x2410
150
135
#define NOVATELWIRELESS_PRODUCT_EU870D 0x2420
···
153
136
/* OVATION PRODUCTS */
154
137
#define NOVATELWIRELESS_PRODUCT_MC727 0x4100
155
138
#define NOVATELWIRELESS_PRODUCT_MC950D 0x4400
139
+
140
+
#define NOVATELWIRELESS_PRODUCT_U727 0x5010
156
141
157
142
/* FUTURE NOVATEL PRODUCTS */
158
143
#define NOVATELWIRELESS_PRODUCT_EVDO_1 0x6000
···
165
146
#define NOVATELWIRELESS_PRODUCT_HSPA_2 0x7001
166
147
#define NOVATELWIRELESS_PRODUCT_EMBEDDED_2 0x8001
167
148
#define NOVATELWIRELESS_PRODUCT_GLOBAL_2 0x9001
149
+
150
+
/* AMOI PRODUCTS */
151
+
#define AMOI_VENDOR_ID 0x1614
152
+
#define AMOI_PRODUCT_H01 0x0800
153
+
#define AMOI_PRODUCT_H01A 0x7002
154
+
#define AMOI_PRODUCT_H02 0x0802
168
155
169
156
#define DELL_VENDOR_ID 0x413C
170
157
···
188
163
#define BANDRICH_PRODUCT_C100_1 0x1002
189
164
#define BANDRICH_PRODUCT_C100_2 0x1003
190
165
166
+
#define AMOI_VENDOR_ID 0x1614
167
+
#define AMOI_PRODUCT_9508 0x0800
168
+
191
169
#define QUALCOMM_VENDOR_ID 0x05C6
170
+
171
+
#define MAXON_VENDOR_ID 0x16d8
192
172
193
173
static struct usb_device_id option_ids[] = {
194
174
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
···
234
204
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) },
235
205
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },
236
206
{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },
207
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1401) },
208
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1403) },
209
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1405) },
210
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1406) },
211
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1408) },
212
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1409) },
213
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1410) },
214
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1411) },
215
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1412) },
216
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1413) },
217
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1414) },
218
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1415) },
219
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1416) },
220
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1417) },
221
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1418) },
222
+
{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E1419) },
223
+
{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) },
237
224
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */
238
225
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */
239
226
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) }, /* Novatel Merlin EX720/V740/X720 */
···
263
216
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EV620) }, /* Novatel EV620/ES620 CDMA/EV-DO */
264
217
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES720) }, /* Novatel ES620/ES720/U720/USB720 */
265
218
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E725) }, /* Novatel E725/E726 */
266
-
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2130) }, /* Novatel Merlin ES620 SM Bus */
219
+
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES620) }, /* Novatel Merlin ES620 SM Bus */
267
220
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU730) }, /* Novatel EU730 and Vodafone EU740 */
268
221
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU740) }, /* Novatel non-Vodafone EU740 */
269
222
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */
270
223
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */
271
224
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */
272
-
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x5010) }, /* Novatel U727 */
225
+
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U727) }, /* Novatel U727 */
273
226
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_1) }, /* Novatel EVDO product */
274
227
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_1) }, /* Novatel HSPA product */
275
228
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_1) }, /* Novatel Embedded product */
···
278
231
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_2) }, /* Novatel HSPA product */
279
232
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_2) }, /* Novatel Embedded product */
280
233
{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL_2) }, /* Novatel Global product */
234
+
235
+
{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) },
236
+
{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) },
237
+
{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H02) },
281
238
282
239
{ USB_DEVICE(DELL_VENDOR_ID, 0x8114) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */
283
240
{ USB_DEVICE(DELL_VENDOR_ID, 0x8115) }, /* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */
···
300
249
{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
301
250
{ USB_DEVICE(KYOCERA_VENDOR_ID, KYOCERA_PRODUCT_KPC680) },
302
251
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
252
+
{ USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */
303
253
{ } /* Terminating entry */
304
254
};
305
255
MODULE_DEVICE_TABLE(usb, option_ids);
+2
drivers/usb/serial/usb-serial.c
+2
drivers/usb/serial/usb-serial.c
···
854
854
serial->num_interrupt_in = num_interrupt_in;
855
855
serial->num_interrupt_out = num_interrupt_out;
856
856
857
+
#if 0
857
858
/* check that the device meets the driver's requirements */
858
859
if ((type->num_interrupt_in != NUM_DONT_CARE &&
859
860
type->num_interrupt_in != num_interrupt_in)
···
868
867
kfree(serial);
869
868
return -EIO;
870
869
}
870
+
#endif
871
871
872
872
/* found all that we need */
873
873
dev_info(&interface->dev, "%s converter detected\n",
+92
-4
drivers/usb/storage/unusual_devs.h
+92
-4
drivers/usb/storage/unusual_devs.h
···
1530
1530
US_SC_DEVICE, US_PR_DEVICE, NULL,
1531
1531
US_FL_IGNORE_RESIDUE ),
1532
1532
1533
-
/* Reported by fangxiaozhi <fangxiaozhi60675@huawei.com>
1534
-
* and by linlei <linlei83@huawei.com>
1535
-
* Patch reworked by Johann Wilhelm <johann.wilhelm@student.tugraz.at>
1536
-
* This brings the HUAWEI E220 devices into multi-port mode
1533
+
/* Reported by fangxiaozhi <huananhu@huawei.com>
1534
+
* This brings the HUAWEI data card devices into multi-port mode
1537
1535
*/
1536
+
UNUSUAL_DEV( 0x12d1, 0x1001, 0x0000, 0x0000,
1537
+
"HUAWEI MOBILE",
1538
+
"Mass Storage",
1539
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1540
+
0),
1538
1541
UNUSUAL_DEV( 0x12d1, 0x1003, 0x0000, 0x0000,
1542
+
"HUAWEI MOBILE",
1543
+
"Mass Storage",
1544
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1545
+
0),
1546
+
UNUSUAL_DEV( 0x12d1, 0x1004, 0x0000, 0x0000,
1547
+
"HUAWEI MOBILE",
1548
+
"Mass Storage",
1549
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1550
+
0),
1551
+
UNUSUAL_DEV( 0x12d1, 0x1401, 0x0000, 0x0000,
1552
+
"HUAWEI MOBILE",
1553
+
"Mass Storage",
1554
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1555
+
0),
1556
+
UNUSUAL_DEV( 0x12d1, 0x1403, 0x0000, 0x0000,
1557
+
"HUAWEI MOBILE",
1558
+
"Mass Storage",
1559
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1560
+
0),
1561
+
UNUSUAL_DEV( 0x12d1, 0x1405, 0x0000, 0x0000,
1562
+
"HUAWEI MOBILE",
1563
+
"Mass Storage",
1564
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1565
+
0),
1566
+
UNUSUAL_DEV( 0x12d1, 0x1406, 0x0000, 0x0000,
1567
+
"HUAWEI MOBILE",
1568
+
"Mass Storage",
1569
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1570
+
0),
1571
+
UNUSUAL_DEV( 0x12d1, 0x1408, 0x0000, 0x0000,
1572
+
"HUAWEI MOBILE",
1573
+
"Mass Storage",
1574
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1575
+
0),
1576
+
UNUSUAL_DEV( 0x12d1, 0x1409, 0x0000, 0x0000,
1577
+
"HUAWEI MOBILE",
1578
+
"Mass Storage",
1579
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1580
+
0),
1581
+
UNUSUAL_DEV( 0x12d1, 0x1410, 0x0000, 0x0000,
1582
+
"HUAWEI MOBILE",
1583
+
"Mass Storage",
1584
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1585
+
0),
1586
+
UNUSUAL_DEV( 0x12d1, 0x1411, 0x0000, 0x0000,
1587
+
"HUAWEI MOBILE",
1588
+
"Mass Storage",
1589
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1590
+
0),
1591
+
UNUSUAL_DEV( 0x12d1, 0x1412, 0x0000, 0x0000,
1592
+
"HUAWEI MOBILE",
1593
+
"Mass Storage",
1594
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1595
+
0),
1596
+
UNUSUAL_DEV( 0x12d1, 0x1413, 0x0000, 0x0000,
1597
+
"HUAWEI MOBILE",
1598
+
"Mass Storage",
1599
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1600
+
0),
1601
+
UNUSUAL_DEV( 0x12d1, 0x1414, 0x0000, 0x0000,
1602
+
"HUAWEI MOBILE",
1603
+
"Mass Storage",
1604
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1605
+
0),
1606
+
UNUSUAL_DEV( 0x12d1, 0x1415, 0x0000, 0x0000,
1607
+
"HUAWEI MOBILE",
1608
+
"Mass Storage",
1609
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1610
+
0),
1611
+
UNUSUAL_DEV( 0x12d1, 0x1416, 0x0000, 0x0000,
1612
+
"HUAWEI MOBILE",
1613
+
"Mass Storage",
1614
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1615
+
0),
1616
+
UNUSUAL_DEV( 0x12d1, 0x1417, 0x0000, 0x0000,
1617
+
"HUAWEI MOBILE",
1618
+
"Mass Storage",
1619
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1620
+
0),
1621
+
UNUSUAL_DEV( 0x12d1, 0x1418, 0x0000, 0x0000,
1622
+
"HUAWEI MOBILE",
1623
+
"Mass Storage",
1624
+
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,
1625
+
0),
1626
+
UNUSUAL_DEV( 0x12d1, 0x1419, 0x0000, 0x0000,
1539
1627
"HUAWEI MOBILE",
1540
1628
"Mass Storage",
1541
1629
US_SC_DEVICE, US_PR_DEVICE, usb_stor_huawei_e220_init,