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

Commit 7c1acff6 authored by Davide Tronchin's avatar Davide Tronchin Committed by Greg Kroah-Hartman
Browse files

USB: serial: option: remove old LARA-R6 PID 

commit 2ec106b96afc19698ff934323b633c0729d4c7f8 upstream.

Remove the UBLOX_PRODUCT_R6XX 0x90fa association since LARA-R6 00B final
product uses a new USB composition with different PID. 0x90fa PID used
only by LARA-R6 internal prototypes.

Move 0x90fa PID directly in the option_ids array since used by other
Qualcomm based modem vendors as pointed out in:

  https://lore.kernel.org/all/6572c4e6-d8bc-b8d3-4396-d879e4e76338@gmail.com



Signed-off-by: default avatarDavide Tronchin <davide.tronchin.94@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a4520c6a

drivers/usb/serial/option.c

+1 −2
Original line number Diff line number Diff line
@@ -240,7 +240,6 @@ static void option_instat_callback(struct urb *urb); 
#define QUECTEL_PRODUCT_UC15			0x9090

/* These u-blox products use Qualcomm's vendor ID */

#define UBLOX_PRODUCT_R410M			0x90b2

#define UBLOX_PRODUCT_R6XX			0x90fa

/* These Yuga products use Qualcomm's vendor ID */

#define YUGA_PRODUCT_CLM920_NC5			0x9625
@@ -1127,7 +1126,7 @@ static const struct usb_device_id option_ids[] = { 
	/* u-blox products using Qualcomm vendor ID */

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R410M),

	  .driver_info = RSVD(1) | RSVD(3) },

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R6XX),

	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x90fa),

	  .driver_info = RSVD(3) },

	/* Quectel products using Quectel vendor ID */

	{ USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21, 0xff, 0xff, 0xff),