From: Zefan Li <lizf@kernel.org>
To: stable@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
"Jaša Bartelj" <jasa.bartelj@gmail.com>,
"Johan Hovold" <johan@kernel.org>,
"Zefan Li" <lizefan@huawei.com>
Subject: [PATCH 3.4 22/45] USB: ftdi_sio: Added PID for new ekey device
Date: Tue, 23 Sep 2014 10:31:24 +0800 [thread overview]
Message-ID: <1411439507-30391-22-git-send-email-lizf@kernel.org> (raw)
In-Reply-To: <1411439259-30224-1-git-send-email-lizf@kernel.org>
From: Jaša Bartelj <jasa.bartelj@gmail.com>
3.4.104-rc1 review patch. If anyone has any objections, please let me know.
------------------
commit 646907f5bfb0782c731ae9ff6fb63471a3566132 upstream.
Added support to the ftdi_sio driver for ekey Converter USB which
uses an FT232BM chip.
Signed-off-by: Jaša Bartelj <jasa.bartelj@gmail.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
[lizf: Backported to 3.4: adjust context]
Signed-off-by: Zefan Li <lizefan@huawei.com>
---
drivers/usb/serial/ftdi_sio.c | 2 ++
drivers/usb/serial/ftdi_sio_ids.h | 5 +++++
2 files changed, 7 insertions(+)
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index eab9340..121a052 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -957,6 +957,8 @@ static struct usb_device_id id_table_combined [] = {
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_2_PID) },
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_3_PID) },
{ USB_DEVICE(BRAINBOXES_VID, BRAINBOXES_US_842_4_PID) },
+ /* ekey Devices */
+ { USB_DEVICE(FTDI_VID, FTDI_EKEY_CONV_USB_PID) },
{ }, /* Optional parameter entry */
{ } /* Terminating entry */
};
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
index 7e926cd..0eb2e97 100644
--- a/drivers/usb/serial/ftdi_sio_ids.h
+++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -1371,3 +1371,8 @@
#define BRAINBOXES_US_160_6_PID 0x9006 /* US-160 16xRS232 1Mbaud Port 11 and 12 */
#define BRAINBOXES_US_160_7_PID 0x9007 /* US-160 16xRS232 1Mbaud Port 13 and 14 */
#define BRAINBOXES_US_160_8_PID 0x9008 /* US-160 16xRS232 1Mbaud Port 15 and 16 */
+
+/*
+ * ekey biometric systems GmbH (http://ekey.net/)
+ */
+#define FTDI_EKEY_CONV_USB_PID 0xCB08 /* Converter USB */
--
1.7.9.5
next prev parent reply other threads:[~2014-09-23 2:39 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-23 2:27 [PATCH 3.4 00/45] 3.4.104-rc1 review Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 01/45] stable_kernel_rules: Add pointer to netdev-FAQ for network patches Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 02/45] ASoC: pxa-ssp: drop SNDRV_PCM_FMTBIT_S24_LE Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 03/45] ibmveth: Fix endian issues with rx_no_buffer statistic Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 04/45] HID: fix a couple of off-by-ones Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 05/45] HID: logitech: perform bounds checking on device_id early enough Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 06/45] isofs: Fix unbounded recursion when processing relocated directories Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 07/45] MIPS: OCTEON: make get_system_type() thread-safe Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 08/45] kvm: iommu: fix the third parameter of kvm_iommu_put_pages (CVE-2014-3601) Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 09/45] pata_scc: propagate return value of scc_wait_after_reset Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 10/45] iommu/amd: Fix cleanup_domain for mass device removal Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 11/45] md/raid6: avoid data corruption during recovery of double-degraded RAID6 Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 12/45] CIFS: Fix wrong directory attributes after rename Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 13/45] ALSA: hda/realtek - Avoid setting wrong COEF on ALC269 & co Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 14/45] xtensa: replace IOCTL code definitions with constants Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 15/45] xtensa: fix address checks in dma_{alloc,free}_coherent Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 16/45] xtensa: fix TLBTEMP_BASE_2 region handling in fast_second_level_miss Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 17/45] xtensa: fix a6 and a7 handling in fast_syscall_xtensa Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 18/45] staging: et131x: Fix errors caused by phydev->addr accesses before initialisation Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 19/45] USB: option: add VIA Telecom CDS7 chipset device id Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 20/45] USB: ftdi_sio: add Basic Micro ATOM Nano USB2Serial PID Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 21/45] USB: serial: pl2303: add device id for ztek device Zefan Li
2014-09-23 2:31 ` Zefan Li [this message]
2014-09-23 2:31 ` [PATCH 3.4 23/45] xhci: Treat not finding the event_seg on COMP_STOP the same as COMP_STOP_INVAL Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 24/45] usb: xhci: amd chipset also needs short TX quirk Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 25/45] USB: whiteheat: Added bounds checking for bulk command response Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 26/45] HID: logitech-dj: prevent false errors to be shown Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 27/45] USB: sisusb: add device id for Magic Control USB video Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 28/45] NFSv4: Fix problems with close in the presence of a delegation Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 29/45] HID: magicmouse: sanity check report size in raw_event() callback Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 30/45] HID: picolcd: " Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 31/45] ARM: 8128/1: abort: don't clear the exclusive monitors Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 32/45] ARM: 8129/1: errata: work around Cortex-A15 erratum 830321 using dummy strex Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 33/45] USB: serial: fix potential stack buffer overflow Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 34/45] USB: serial: fix potential heap " Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 35/45] MIPS: perf: Fix build error caused by unused counters_per_cpu_to_total() Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 36/45] MIPS: Fix accessing to per-cpu data when flushing the cache Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 37/45] openrisc: add missing header inclusion Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 38/45] slab/mempolicy: always use local policy from interrupt context Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 39/45] 8250_pci: fix warnings in backport of Broadcom TruManage support Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 40/45] unicore32: select generic atomic64_t support Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 41/45] UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 42/45] UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 43/45] alpha: Fix fall-out from disintegrating asm/system.h Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 44/45] ext2: Fix fs corruption in ext2_get_xip_mem() Zefan Li
2014-09-23 2:31 ` [PATCH 3.4 45/45] alpha: add io{read,write}{16,32}be functions Zefan Li
2014-09-23 2:42 ` [PATCH 3.4 00/45] 3.4.104-rc1 review Guenter Roeck
2014-09-23 2:54 ` Guenter Roeck
2014-09-23 2:54 ` Zefan Li
2014-09-23 2:56 ` Zefan Li
2014-09-23 4:54 ` Satoru Takeuchi
2014-09-23 6:12 ` Zefan Li
2014-09-23 4:58 ` Guenter Roeck
2014-09-23 6:14 ` Zefan Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1411439507-30391-22-git-send-email-lizf@kernel.org \
--to=lizf@kernel.org \
--cc=jasa.bartelj@gmail.com \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan@huawei.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox