Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f37bca1 authored by Leann Ogasawara's avatar Leann Ogasawara Committed by Greg Kroah-Hartman
Browse files

USB: option: Remove duplicate AMOI_VENDOR_ID 



AMOI_VENDOR_ID is defined twice.  Remove the duplicate entry and move
the AMOI_PRODUCT_9508 definition to be grouped with the other AMOI
product definitions.

Originally-by: default avatarBen Collins <ben.collins@ubuntu.com>
Signed-off-by: default avatarLeann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5a9cdf33

drivers/usb/serial/option.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -264,9 +264,6 @@ static void option_instat_callback(struct urb *urb); 
#define BANDRICH_PRODUCT_1011			0x1011

#define BANDRICH_PRODUCT_1011			0x1011

#define BANDRICH_PRODUCT_1012			0x1012

#define BANDRICH_PRODUCT_1012			0x1012





#define AMOI_VENDOR_ID			0x1614

#define AMOI_PRODUCT_9508			0x0800



#define QUALCOMM_VENDOR_ID			0x05C6

#define QUALCOMM_VENDOR_ID			0x05C6





#define CMOTECH_VENDOR_ID			0x16d8

#define CMOTECH_VENDOR_ID			0x16d8
@@ -483,7 +480,6 @@ static const struct usb_device_id option_ids[] = { 
	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },

	{ USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) },

	{ USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) },

	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_9508) },

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) }, /* Novatel Merlin EX720/V740/X720 */

	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) }, /* Novatel Merlin EX720/V740/X720 */