diff mbox series

[5.9,04/75] USB: serial: ch341: sort device-id entries

Message ID	20201210142606.292270324@linuxfoundation.org
State	New
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 5.9 04/75] USB: serial: ch341: sort device-id entries Date: Thu, 10 Dec 2020 15:26:29 +0100 Message-Id: <20201210142606.292270324@linuxfoundation.org> In-Reply-To: <20201210142606.074509102@linuxfoundation.org> References: <20201210142606.074509102@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 [5.9,02/75] USB: serial: kl5kusb105: fix memleak on open [5.9,04/75] USB: serial: ch341: sort device-id entries [5.9,07/75] USB: serial: option: fix Quectel BG96 matching [5.9,09/75] tty: Fix ->session locking [5.9,10/75] speakup: Reject setting the speakup line discipline outside of speakup [5.9,12/75] ALSA: hda/realtek: Add mute LED quirk to yet another HP x360 model [5.9,14/75] ALSA: hda/realtek - Add new codec supported for ALC897 [5.9,16/75] ALSA: hda/generic: Add option to enforce preferred_dacs pairs [5.9,18/75] ring-buffer: Set the right timestamp in the slow path of __rb_reserve_next() [5.9,19/75] ring-buffer: Always check to put back before stamp when crossing pages [5.9,21/75] ftrace: Fix DYNAMIC_FTRACE_WITH_DIRECT_CALLS dependency [5.9,23/75] cifs: fix potential use-after-free in cifs_echo_request() [5.9,27/75] gfs2: Fix deadlock between gfs2_{create_inode,inode_lookup} and delete_work_func [5.9,34/75] drm/omap: sdi: fix bridge enable/disable [5.9,37/75] drm/i915/gt: Retain default context state across shrinking [5.9,38/75] drm/i915/gt: Limit frequency drop to RPe on parking [5.9,40/75] KVM: PPC: Book3S HV: XIVE: Fix vCPU id sanity check [5.9,42/75] io_uring: fix recvmsg setup with compat buf-select [5.9,43/75] dm writecache: advance the number of arguments when reporting max_age [5.9,45/75] powerpc/64s/powernv: Fix memory corruption when saving SLB entries on MCE [5.9,46/75] genirq/irqdomain: Add an irq_create_mapping_affinity() function [5.9,49/75] dm: fix double RCU unlock in dm_dax_zero_page_range() error path [5.9,50/75] dm: remove invalid sparse __acquires and __releases annotations [5.9,51/75] x86/uprobes: Do not use prefixes.nbytes when looping over prefixes.bytes [5.9,53/75] mm: list_lru: set shrinker map bit when child nr_items is not zero [5.9,57/75] iommu/amd: Set DTE[IntTabLen] to represent 512 IRTEs [5.9,58/75] mm: memcg/slab: fix obj_cgroup_charge() return value handling [5.9,59/75] lib/syscall: fix syscall registers retrieval on 32-bit platforms [5.9,60/75] can: af_can: can_rx_unregister(): remove WARN() statement from list operation sanity ... [5.9,61/75] gfs2: check for empty rgrp tree in gfs2_ri_update [5.9,63/75] tipc: fix a deadlock when flushing scheduled work [5.9,64/75] ASoC: wm_adsp: fix error return code in wm_adsp_load() [5.9,65/75] gfs2: Fix deadlock dumping resource group glocks [5.9,66/75] gfs2: Dont freeze the file system during unmount [5.9,68/75] i2c: qcom: Fix IRQ error misassignement [5.9,69/75] i2c: qup: Fix error return code in qup_i2c_bam_schedule_desc() [5.9,70/75] dm writecache: remove BUG() and fail gracefully instead [5.9,71/75] Input: i8042 - fix error return code in i8042_setup_aux()

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
@@ -81,11 +81,11 @@ 
 #define CH341_QUIRK_SIMULATE_BREAK	BIT(1)
 
 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);