From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 11 Mar 2010 19:55:05 +0000 (-0800)
Subject: .33 patches
X-Git-Tag: v2.6.32.10~13
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e92401d1134c4b6c864e0f44792d89cc49f4583;p=thirdparty%2Fkernel%2Fstable-queue.git

.33 patches
---

diff --git a/queue-2.6.33/series b/queue-2.6.33/series
index 54c2ce87acd..0509ee08169 100644
--- a/queue-2.6.33/series
+++ b/queue-2.6.33/series
@@ -97,6 +97,7 @@ usb-remove-debugging-message-for-uevent-constructions.patch
 usb-move-hcd-free_dev-call-into-usb_disconnect-to-fix-oops.patch
 usb-f_mass_storage-fix-crash-on-bind-error.patch
 usb-add-new-ftdi_sio-device-ids.patch
+usb-serial-ftdi-add-contec-vendor-and-product-id.patch
 sched-fix-sched_mv_power_savings-for-smt.patch
 sched-fix-smt-scheduler-regression-in-find_busiest_queue.patch
 sched-don-t-use-possibly-stale-sched_class.patch
diff --git a/queue-2.6.33/usb-serial-ftdi-add-contec-vendor-and-product-id.patch b/queue-2.6.33/usb-serial-ftdi-add-contec-vendor-and-product-id.patch
new file mode 100644
index 00000000000..3e23cb012ea
--- /dev/null
+++ b/queue-2.6.33/usb-serial-ftdi-add-contec-vendor-and-product-id.patch
@@ -0,0 +1,48 @@
+From 46b72d78cb022714c89a9ebc00b9581b550cfca7 Mon Sep 17 00:00:00 2001
+From: Daniel Sangorrin <daniel.sangorrin@gmail.com>
+Date: Mon, 22 Feb 2010 11:03:11 +0900
+Subject: USB: serial: ftdi: add CONTEC vendor and product id
+
+From: Daniel Sangorrin <daniel.sangorrin@gmail.com>
+
+commit 46b72d78cb022714c89a9ebc00b9581b550cfca7 upstream.
+
+This is a patch to ftdi_sio_ids.h and ftdi_sio.c that adds
+identifiers for CONTEC USB serial converter. I tested it
+with the device COM-1(USB)H
+
+Signed-off-by: Daniel Sangorrin <daniel.sangorrin@gmail.com>
+Cc: Andreas Mohr <andi@lisas.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c     |    1 +
+ drivers/usb/serial/ftdi_sio_ids.h |    7 +++++++
+ 2 files changed, 8 insertions(+)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -614,6 +614,7 @@ static struct usb_device_id id_table_com
+ 	{ USB_DEVICE(FTDI_VID, FTDI_OCEANIC_PID) },
+ 	{ USB_DEVICE(TTI_VID, TTI_QL355P_PID) },
+ 	{ USB_DEVICE(FTDI_VID, FTDI_RM_CANVIEW_PID) },
++	{ USB_DEVICE(CONTEC_VID, CONTEC_COM1USBH_PID) },
+ 	{ USB_DEVICE(BANDB_VID, BANDB_USOTL4_PID) },
+ 	{ USB_DEVICE(BANDB_VID, BANDB_USTL4_PID) },
+ 	{ USB_DEVICE(BANDB_VID, BANDB_USO9ML2_PID) },
+--- a/drivers/usb/serial/ftdi_sio_ids.h
++++ b/drivers/usb/serial/ftdi_sio_ids.h
+@@ -494,6 +494,13 @@
+ #define RATOC_PRODUCT_ID_USB60F	0xb020
+ 
+ /*
++ * Contec products (http://www.contec.com)
++ * Submitted by Daniel Sangorrin
++ */
++#define CONTEC_VID		0x06CE	/* Vendor ID */
++#define CONTEC_COM1USBH_PID	0x8311	/* COM-1(USB)H */
++
++/*
+  * Definitions for B&B Electronics products.
+  */
+ #define BANDB_VID		0x0856	/* B&B Electronics Vendor ID */