← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-lts-quantal/precise-updates

« back to all changes in this revision

Viewing changes to drivers/usb/serial/option.c

  • Committer: Package Import Robot
  • Author(s): Luis Henriques, Luis Henriques, Tim Gardner
  • Date: 2013-02-07 12:08:38 UTC
  • Revision ID: package-import@ubuntu.com-20130207120838-8jaukepmb85dkevq
Tags: 3.5.0-24.37~precise1
https://launchpad.net/bugs/1118287
https://launchpad.net/bugs/927782
[Luis Henriques]

* Release Tracking Bug
  - LP: #1118287

[ Tim Gardner ]

* [Config] CONFIG_ALX=m for x86 only
  - LP: #927782

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/usb/serial/option.c
80
80
#define OPTION_PRODUCT_GTM380_MODEM             0x7201
81
81
 
82
82
#define HUAWEI_VENDOR_ID                        0x12D1
 
83
#define HUAWEI_PRODUCT_E173                     0x140C
83
84
#define HUAWEI_PRODUCT_K4505                    0x1464
84
85
#define HUAWEI_PRODUCT_K3765                    0x1465
85
86
#define HUAWEI_PRODUCT_K4605                    0x14C6
287
288
#define ALCATEL_VENDOR_ID                       0x1bbb
288
289
#define ALCATEL_PRODUCT_X060S_X200              0x0000
289
290
#define ALCATEL_PRODUCT_X220_X500D              0x0017
 
291
#define ALCATEL_PRODUCT_L100V                   0x011e
290
292
 
291
293
#define PIRELLI_VENDOR_ID                       0x1266
292
294
#define PIRELLI_PRODUCT_C100_1                  0x1002
428
430
#define MEDIATEK_VENDOR_ID                      0x0e8d
429
431
#define MEDIATEK_PRODUCT_DC_1COM                0x00a0
430
432
#define MEDIATEK_PRODUCT_DC_4COM                0x00a5
 
433
#define MEDIATEK_PRODUCT_DC_4COM2               0x00a7
431
434
#define MEDIATEK_PRODUCT_DC_5COM                0x00a4
432
435
#define MEDIATEK_PRODUCT_7208_1COM              0x7101
433
436
#define MEDIATEK_PRODUCT_7208_2COM              0x7102
 
437
#define MEDIATEK_PRODUCT_7103_2COM              0x7103
 
438
#define MEDIATEK_PRODUCT_7106_2COM              0x7106
434
439
#define MEDIATEK_PRODUCT_FP_1COM                0x0003
435
440
#define MEDIATEK_PRODUCT_FP_2COM                0x0023
436
441
#define MEDIATEK_PRODUCT_FPDC_1COM              0x0043
440
445
#define CELLIENT_VENDOR_ID                      0x2692
441
446
#define CELLIENT_PRODUCT_MEN200                 0x9005
442
447
 
 
448
/* Hyundai Petatel Inc. products */
 
449
#define PETATEL_VENDOR_ID                       0x1ff4
 
450
#define PETATEL_PRODUCT_NP10T                   0x600e
 
451
 
443
452
/* some devices interfaces need special handling due to a number of reasons */
444
453
enum option_blacklist_reason {
445
454
                OPTION_BLACKLIST_NONE = 0,
552
561
        { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) },
553
562
        { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) },
554
563
        { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
 
564
        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff),
 
565
                .driver_info = (kernel_ulong_t) &net_intf1_blacklist },
555
566
        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),
556
567
                .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
557
568
        { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff),
883
894
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0126, 0xff, 0xff, 0xff),
884
895
                .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
885
896
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0128, 0xff, 0xff, 0xff) },
 
897
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0135, 0xff, 0xff, 0xff) },
 
898
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0136, 0xff, 0xff, 0xff) },
 
899
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0137, 0xff, 0xff, 0xff) },
 
900
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0139, 0xff, 0xff, 0xff) },
886
901
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0142, 0xff, 0xff, 0xff) },
887
902
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0143, 0xff, 0xff, 0xff) },
888
903
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0144, 0xff, 0xff, 0xff) },
903
918
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0165, 0xff, 0xff, 0xff) },
904
919
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0167, 0xff, 0xff, 0xff),
905
920
          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
 
921
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0189, 0xff, 0xff, 0xff) },
906
922
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0191, 0xff, 0xff, 0xff), /* ZTE EuFi890 */
907
923
          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
 
924
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0196, 0xff, 0xff, 0xff) },
 
925
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0197, 0xff, 0xff, 0xff) },
908
926
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0199, 0xff, 0xff, 0xff), /* ZTE MF820S */
909
927
          .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
 
928
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0200, 0xff, 0xff, 0xff) },
 
929
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0201, 0xff, 0xff, 0xff) },
 
930
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0254, 0xff, 0xff, 0xff) },
910
931
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0257, 0xff, 0xff, 0xff), /* ZTE MF821 */
911
932
          .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
 
933
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff) },
 
934
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff), /* ZTE MF880 */
 
935
          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
 
936
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0317, 0xff, 0xff, 0xff) },
912
937
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0326, 0xff, 0xff, 0xff),
913
938
          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
 
939
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0330, 0xff, 0xff, 0xff) },
 
940
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0395, 0xff, 0xff, 0xff) },
 
941
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0414, 0xff, 0xff, 0xff) },
 
942
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0417, 0xff, 0xff, 0xff) },
914
943
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff),
915
944
          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
916
945
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff),
917
946
          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
918
947
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1012, 0xff, 0xff, 0xff),
919
948
          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
 
949
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1018, 0xff, 0xff, 0xff) },
920
950
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1021, 0xff, 0xff, 0xff),
921
951
          .driver_info = (kernel_ulong_t)&net_intf2_blacklist },
922
952
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1057, 0xff, 0xff, 0xff) },
1096
1126
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1298, 0xff, 0xff, 0xff) },
1097
1127
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1299, 0xff, 0xff, 0xff) },
1098
1128
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1300, 0xff, 0xff, 0xff) },
 
1129
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1301, 0xff, 0xff, 0xff) },
 
1130
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1302, 0xff, 0xff, 0xff) },
 
1131
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1303, 0xff, 0xff, 0xff) },
 
1132
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1333, 0xff, 0xff, 0xff) },
1099
1133
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1401, 0xff, 0xff, 0xff),
1100
1134
                .driver_info = (kernel_ulong_t)&net_intf2_blacklist },
1101
1135
        { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1402, 0xff, 0xff, 0xff),
1165
1199
          .driver_info = (kernel_ulong_t)&alcatel_x200_blacklist
1166
1200
        },
1167
1201
        { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X220_X500D) },
 
1202
        { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_L100V),
 
1203
          .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
1168
1204
        { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) },
1169
1205
        { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) },
1170
1206
        { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14),
1269
1305
        { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FP_2COM, 0x0a, 0x00, 0x00) },
1270
1306
        { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FPDC_1COM, 0x0a, 0x00, 0x00) },
1271
1307
        { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_FPDC_2COM, 0x0a, 0x00, 0x00) },
 
1308
        { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_7103_2COM, 0xff, 0x00, 0x00) },
 
1309
        { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_7106_2COM, 0x02, 0x02, 0x01) },
 
1310
        { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x02, 0x01) },
 
1311
        { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, MEDIATEK_PRODUCT_DC_4COM2, 0xff, 0x00, 0x00) },
1272
1312
        { USB_DEVICE(CELLIENT_VENDOR_ID, CELLIENT_PRODUCT_MEN200) },
 
1313
        { USB_DEVICE(PETATEL_VENDOR_ID, PETATEL_PRODUCT_NP10T) },
1273
1314
        { } /* Terminating entry */
1274
1315
};
1275
1316
MODULE_DEVICE_TABLE(usb, option_ids);