aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOKAMOTO Yoshiaki <yokamoto@allied-telesis.co.jp>2018-01-16 04:51:17 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-01-22 09:22:27 -0500
commit69341bd15018da0a662847e210f9b2380c71e623 (patch)
treeecc98d9e9729911ea35d4d3fcbae5c2f0686c10e
parent26c502701c5287cd826b8a62358187f4b8941363 (diff)
usb: option: Add support for FS040U modem
FS040U modem is manufactured by omega, and sold by Fujisoft. This patch adds ID of the modem to use option1 driver. Interface 3 is used as qmi_wwan, so the interface is ignored. Signed-off-by: Yoshiaki Okamoto <yokamoto@allied-telesis.co.jp> Signed-off-by: Hiroyuki Yamamoto <hyamamo@allied-telesis.co.jp> Cc: stable <stable@vger.kernel.org> Acked-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/option.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index b6320e3be429..5db8ed517e0e 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -380,6 +380,9 @@ static void option_instat_callback(struct urb *urb);
380#define FOUR_G_SYSTEMS_PRODUCT_W14 0x9603 380#define FOUR_G_SYSTEMS_PRODUCT_W14 0x9603
381#define FOUR_G_SYSTEMS_PRODUCT_W100 0x9b01 381#define FOUR_G_SYSTEMS_PRODUCT_W100 0x9b01
382 382
383/* Fujisoft products */
384#define FUJISOFT_PRODUCT_FS040U 0x9b02
385
383/* iBall 3.5G connect wireless modem */ 386/* iBall 3.5G connect wireless modem */
384#define IBALL_3_5G_CONNECT 0x9605 387#define IBALL_3_5G_CONNECT 0x9605
385 388
@@ -1894,6 +1897,8 @@ static const struct usb_device_id option_ids[] = {
1894 { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W100), 1897 { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W100),
1895 .driver_info = (kernel_ulong_t)&four_g_w100_blacklist 1898 .driver_info = (kernel_ulong_t)&four_g_w100_blacklist
1896 }, 1899 },
1900 {USB_DEVICE(LONGCHEER_VENDOR_ID, FUJISOFT_PRODUCT_FS040U),
1901 .driver_info = (kernel_ulong_t)&net_intf3_blacklist},
1897 { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) }, 1902 { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, SPEEDUP_PRODUCT_SU9800, 0xff) },
1898 { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9801, 0xff), 1903 { USB_DEVICE_INTERFACE_CLASS(LONGCHEER_VENDOR_ID, 0x9801, 0xff),
1899 .driver_info = (kernel_ulong_t)&net_intf3_blacklist }, 1904 .driver_info = (kernel_ulong_t)&net_intf3_blacklist },