diff mbox series

[4.19,06/39] USB: serial: ch341: sort device-id entries

Message ID	20201210142602.608110780@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Johan Hovold <johan@kernel.org> Subject: [PATCH 4.19 06/39] USB: serial: ch341: sort device-id entries Date: Thu, 10 Dec 2020 15:26:45 +0100 Message-Id: <20201210142602.608110780@linuxfoundation.org> In-Reply-To: <20201210142602.272595094@linuxfoundation.org> References: <20201210142602.272595094@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.4,05/39] netfilter: bridge: reset skb->pkt_type after NF_INET_POST_ROUTING traversal [4.4,08/39] net: pasemi: fix error return code in pasemi_mac_open() [4.4,12/39] powerpc: Stop exporting __clear_user which is now inlined. [4.4,13/39] btrfs: sysfs: init devices outside of the chunk_mutex [4.4,14/39] vlan: consolidate VLAN parsing code and limit max parsing depth [4.4,18/39] USB: serial: ch341: add new Product ID for CH341A [4.4,21/39] USB: serial: option: add support for Thales Cinterion EXS82 [4.4,27/39] i2c: imx: Fix reset of I2SR_IAL flag [4.4,29/39] arm64: assembler: make adr_l work in modules under KASLR [4.4,30/39] iommu/amd: Set DTE[IntTabLen] to represent 512 IRTEs [4.19,03/39] usb: gadget: f_fs: Use local copy of descriptors for userspace copy [4.4,31/39] spi: Introduce device-managed SPI controller allocation [4.4,33/39] spi: bcm2835: Release the DMA channel if probe fails after dma_init [4.19,06/39] USB: serial: ch341: sort device-id entries [4.4,35/39] btrfs: cleanup cow block on error [4.4,36/39] mm/userfaultfd: do not access vma->vm_mm after calling handle_userfault() [4.19,10/39] tty: Fix ->pgrp locking in tiocspgrp() [4.19,15/39] ALSA: hda/generic: Add option to enforce preferred_dacs pairs [4.19,16/39] ftrace: Fix updating FTRACE_FL_TRAMP [4.19,17/39] cifs: fix potential use-after-free in cifs_echo_request() [4.19,22/39] mm: list_lru: set shrinker map bit when child nr_items is not zero [4.19,23/39] mm/swapfile: do not sleep with a spin lock held [4.19,25/39] i2c: imx: Fix reset of I2SR_IAL flag [4.19,28/39] iommu/amd: Set DTE[IntTabLen] to represent 512 IRTEs [4.19,32/39] spi: bcm2835: Release the DMA channel if probe fails after dma_init [4.19,37/39] Input: i8042 - fix error return code in i8042_setup_aux() [4.19,38/39] netfilter: nf_tables: avoid false-postive lockdep splat

Commit Message

Greg KH Dec. 10, 2020, 2:26 p.m. UTC

From: Johan Hovold <johan@kernel.org>

commit bf193bfc12dbc3754fc8a6e0e1e3702f1af2f772 upstream.

Keep the device-id entries sorted to make it easier to add new ones in
the right spot.

Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/usb/serial/ch341.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff mbox series

Patch

--- a/drivers/usb/serial/ch341.c
+++ b/drivers/usb/serial/ch341.c
@@ -80,11 +80,11 @@ 
 #define CH341_LCR_CS5          0x00
 
 static const struct usb_device_id id_table[] = {
-	{ USB_DEVICE(0x4348, 0x5523) },
-	{ USB_DEVICE(0x1a86, 0x7522) },
-	{ USB_DEVICE(0x1a86, 0x7523) },
 	{ USB_DEVICE(0x1a86, 0x5512) },
 	{ USB_DEVICE(0x1a86, 0x5523) },
+	{ USB_DEVICE(0x1a86, 0x7522) },
+	{ USB_DEVICE(0x1a86, 0x7523) },
+	{ USB_DEVICE(0x4348, 0x5523) },
 	{ },
 };
 MODULE_DEVICE_TABLE(usb, id_table);