aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2010-08-19 16:17:53 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-19 16:17:53 -0700
commitd23d5143b3dc513c039a4dc12fac8abdac3ab63c (patch)
tree5110a69ca919e1b2a37788f6f5a774be5bcc0840
parent7cc1ca05420bf15bf694d1c4677dd8463161ab04 (diff)
downloadpatches-d23d5143b3dc513c039a4dc12fac8abdac3ab63c.tar.gz
another patch
-rw-r--r--series2
-rw-r--r--usb.current/usb-ftdi_sio-add-product-id-for-lenz-li-usb.patch46
2 files changed, 48 insertions, 0 deletions
diff --git a/series b/series
index dbdbc09b83ab8e..d6a0c367e79a8e 100644
--- a/series
+++ b/series
@@ -52,6 +52,7 @@ usb.current/usb-xhci-remove-buggy-assignment-in-next_trb.patch
usb.current/usb-xhci-update-ring-dequeue-pointer-when-process-missed-tds.patch
usb.current/usb-iowarrior-fix-misuse-of-return-value-of-copy_to_user.patch
usb.current/usb-adutux-fix-misuse-of-return-value-of-copy_to_user.patch
+usb.current/usb-ftdi_sio-add-product-id-for-lenz-li-usb.patch
#################################
@@ -89,3 +90,4 @@ staging.current/staging-spectra-removes-unused-functions.patch
+
diff --git a/usb.current/usb-ftdi_sio-add-product-id-for-lenz-li-usb.patch b/usb.current/usb-ftdi_sio-add-product-id-for-lenz-li-usb.patch
new file mode 100644
index 00000000000000..f9cc5552b465b1
--- /dev/null
+++ b/usb.current/usb-ftdi_sio-add-product-id-for-lenz-li-usb.patch
@@ -0,0 +1,46 @@
+From linux-usb-owner@vger.kernel.org Thu Aug 19 11:58:57 2010
+To: linux-usb@vger.kernel.org
+From: galens@seitzassoc.com
+Subject: USB: ftdi_sio: add product ID for Lenz LI-USB
+Message-Id: <20100819181520.ABE99101B5@toto.seitzassoc.com>
+Date: Thu, 19 Aug 2010 11:15:20 -0700 (PDT)
+
+From: Galen Seitz <galens@seitzassoc.com>
+
+Add ftdi product ID for Lenz LI-USB, a model train interface. This
+was NOT tested against 2.6.35, but a similar patch was tested with the
+CentOS 2.6.18-194.11.1.el5 kernel. It wasn't clear to me what
+ordering is being used in ftdi_sio.c, so I inserted the ID after another
+model train entry(SPROG_II).
+
+Signed-off-by: Galen Seitz <galens@seitzassoc.com>
+Cc: stable <stable@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c | 1 +
+ drivers/usb/serial/ftdi_sio_ids.h | 3 +++
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -180,6 +180,7 @@ static struct usb_device_id id_table_com
+ { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) },
+ { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) },
++ { USB_DEVICE(FTDI_VID, FTDI_LENZ_LIUSB_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_XF_632_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_XF_634_PID) },
+ { USB_DEVICE(FTDI_VID, FTDI_XF_547_PID) },
+--- a/drivers/usb/serial/ftdi_sio_ids.h
++++ b/drivers/usb/serial/ftdi_sio_ids.h
+@@ -110,6 +110,9 @@
+ /* Propox devices */
+ #define FTDI_PROPOX_JTAGCABLEII_PID 0xD738
+
++/* Lenz LI-USB Computer Interface. */
++#define FTDI_LENZ_LIUSB_PID 0xD780
++
+ /*
+ * Xsens Technologies BV products (http://www.xsens.com).
+ */