2.6.32-stable patches

added patches:
	usb-cdc-wdm-updating-desc-length-must-be-protected-by-spin_lock.patch
	usb-ftdi_sio-add-more-identifiers.patch
	usb-ftdi_sio-add-pid-for-ti-xds100v2-beaglebone-a3.patch
	usb-ftdi_sio-fix-tiocsserial-baud_base-handling.patch
	usb-serial-ftdi-additional-ids.patch

6 files changed, 213 insertions, 0 deletions

diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index 8fd4a61..d732a5a 100644
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -7,3 +7,8 @@ crypto-sha512-reduce-stack-usage-to-safe-number.patch
 revert-arm-7220-1-mmc-mmci-fixup-error-handling-for-dma.patch
 block-fail-scsi-passthrough-ioctls-on-partition-devices.patch
 dm-do-not-forward-ioctls-from-logical-volumes-to-the-underlying-device.patch
+usb-ftdi_sio-fix-tiocsserial-baud_base-handling.patch
+usb-ftdi_sio-add-pid-for-ti-xds100v2-beaglebone-a3.patch
+usb-serial-ftdi-additional-ids.patch
+usb-ftdi_sio-add-more-identifiers.patch
+usb-cdc-wdm-updating-desc-length-must-be-protected-by-spin_lock.patch
diff --git a/queue-2.6.32/usb-cdc-wdm-updating-desc-length-must-be-protected-by-spin_lock.patch b/queue-2.6.32/usb-cdc-wdm-updating-desc-length-must-be-protected-by-spin_lock.patch
new file mode 100644
index 0000000..a2c6ac6
--- /dev/null
+++ b/queue-2.6.32/usb-cdc-wdm-updating-desc-length-must-be-protected-by-spin_lock.patch
@@ -0,0 +1,34 @@
+From c428b70c1e115c5649707a602742e34130d19428 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
+Date: Mon, 16 Jan 2012 12:41:47 +0100
+Subject: USB: cdc-wdm: updating desc->length must be protected by spin_lock
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Bjørn Mork <bjorn@mork.no>
+
+commit c428b70c1e115c5649707a602742e34130d19428 upstream.
+
+wdm_in_callback() will also touch this field, so we cannot change it without locking
+
+Signed-off-by: Bjørn Mork <bjorn@mork.no>
+Acked-by: Oliver Neukum <oneukum@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/class/cdc-wdm.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/usb/class/cdc-wdm.c
++++ b/drivers/usb/class/cdc-wdm.c
+@@ -458,7 +458,9 @@ retry:
+ 	for (i = 0; i < desc->length - cntr; i++)
+ 		desc->ubuf[i] = desc->ubuf[i + cntr];
+ 
++	spin_lock_irq(&desc->iuspin);
+ 	desc->length -= cntr;
++	spin_unlock_irq(&desc->iuspin);
+ 	/* in case we had outstanding data */
+ 	if (!desc->length)
+ 		clear_bit(WDM_READ, &desc->flags);
diff --git a/queue-2.6.32/usb-ftdi_sio-add-more-identifiers.patch b/queue-2.6.32/usb-ftdi_sio-add-more-identifiers.patch
new file mode 100644
index 0000000..cc7bc5a
--- /dev/null
+++ b/queue-2.6.32/usb-ftdi_sio-add-more-identifiers.patch
@@ -0,0 +1,44 @@
+From 2353f806c97020d4c7709f15eebb49b591f7306d Mon Sep 17 00:00:00 2001
+From: Alan Cox <alan@linux.intel.com>
+Date: Thu, 26 Jan 2012 17:41:34 +0000
+Subject: USB: ftdi_sio: Add more identifiers
+
+From: Alan Cox <alan@linux.intel.com>
+
+commit 2353f806c97020d4c7709f15eebb49b591f7306d upstream.
+
+0x04d8, 0x000a: Hornby Elite
+
+Signed-off-by: Alan Cox <alan@linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c     |    1 +
+ drivers/usb/serial/ftdi_sio_ids.h |    6 ++++++
+ 2 files changed, 7 insertions(+)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -798,6 +798,7 @@ static struct usb_device_id id_table_com
+ 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+ 	{ USB_DEVICE(ADI_VID, ADI_GNICEPLUS_PID),
+ 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
++	{ USB_DEVICE(HORNBY_VID, HORNBY_ELITE_PID) },
+ 	{ USB_DEVICE(JETI_VID, JETI_SPC1201_PID) },
+ 	{ USB_DEVICE(MARVELL_VID, MARVELL_SHEEVAPLUG_PID),
+ 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+--- a/drivers/usb/serial/ftdi_sio_ids.h
++++ b/drivers/usb/serial/ftdi_sio_ids.h
+@@ -531,6 +531,12 @@
+ #define ADI_GNICEPLUS_PID 	0xF001
+ 
+ /*
++ * Hornby Elite
++ */
++#define HORNBY_VID		0x04D8
++#define HORNBY_ELITE_PID	0x000A
++
++/*
+  * RATOC REX-USB60F
+  */
+ #define RATOC_VENDOR_ID		0x0584
diff --git a/queue-2.6.32/usb-ftdi_sio-add-pid-for-ti-xds100v2-beaglebone-a3.patch b/queue-2.6.32/usb-ftdi_sio-add-pid-for-ti-xds100v2-beaglebone-a3.patch
new file mode 100644
index 0000000..7ae90de
--- /dev/null
+++ b/queue-2.6.32/usb-ftdi_sio-add-pid-for-ti-xds100v2-beaglebone-a3.patch
@@ -0,0 +1,46 @@
+From 55f13aeae0346f0c89bfface91ad9a97653dc433 Mon Sep 17 00:00:00 2001
+From: Peter Korsgaard <jacmet@sunsite.dk>
+Date: Wed, 18 Jan 2012 23:43:45 +0100
+Subject: USB: ftdi_sio: add PID for TI XDS100v2 / BeagleBone A3
+
+From: Peter Korsgaard <jacmet@sunsite.dk>
+
+commit 55f13aeae0346f0c89bfface91ad9a97653dc433 upstream.
+
+Port A for JTAG, port B for serial.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c     |    2 ++
+ drivers/usb/serial/ftdi_sio_ids.h |    7 +++++++
+ 2 files changed, 9 insertions(+)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -806,6 +806,8 @@ static struct usb_device_id id_table_com
+ 	{ USB_DEVICE(BAYER_VID, BAYER_CONTOUR_CABLE_PID) },
+ 	{ USB_DEVICE(FTDI_VID, MARVELL_OPENRD_PID),
+ 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
++	{ USB_DEVICE(FTDI_VID, TI_XDS100V2_PID),
++		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+ 	{ USB_DEVICE(FTDI_VID, HAMEG_HO820_PID) },
+ 	{ USB_DEVICE(FTDI_VID, HAMEG_HO720_PID) },
+ 	{ USB_DEVICE(FTDI_VID, HAMEG_HO730_PID) },
+--- a/drivers/usb/serial/ftdi_sio_ids.h
++++ b/drivers/usb/serial/ftdi_sio_ids.h
+@@ -38,6 +38,13 @@
+ /* www.candapter.com Ewert Energy Systems CANdapter device */
+ #define FTDI_CANDAPTER_PID 0x9F80 /* Product Id */
+ 
++/*
++ * Texas Instruments XDS100v2 JTAG / BeagleBone A3
++ * http://processors.wiki.ti.com/index.php/XDS100
++ * http://beagleboard.org/bone
++ */
++#define TI_XDS100V2_PID		0xa6d0
++
+ #define FTDI_NXTCAM_PID		0xABB8 /* NXTCam for Mindstorms NXT */
+ 
+ /* US Interface Navigator (http://www.usinterface.com/) */
diff --git a/queue-2.6.32/usb-ftdi_sio-fix-tiocsserial-baud_base-handling.patch b/queue-2.6.32/usb-ftdi_sio-fix-tiocsserial-baud_base-handling.patch
new file mode 100644
index 0000000..e837586
--- /dev/null
+++ b/queue-2.6.32/usb-ftdi_sio-fix-tiocsserial-baud_base-handling.patch
@@ -0,0 +1,39 @@
+From eb833a9e0972f60beb4ab8104ad7ef6bf30f02fc Mon Sep 17 00:00:00 2001
+From: Johan Hovold <jhovold@gmail.com>
+Date: Tue, 10 Jan 2012 23:33:37 +0100
+Subject: USB: ftdi_sio: fix TIOCSSERIAL baud_base handling
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Johan Hovold <jhovold@gmail.com>
+
+commit eb833a9e0972f60beb4ab8104ad7ef6bf30f02fc upstream.
+
+Return EINVAL if new baud_base does not match the current one.
+
+The baud_base is device specific and can not be changed. This restores
+the old (pre-2005) behaviour which was changed due to a
+misunderstanding regarding this fact (see
+https://lkml.org/lkml/2005/1/20/84).
+
+Reported-by: Torbjörn Lofterud <torbjorn@pi.nxs.se>
+Signed-off-by: Johan Hovold <jhovold@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -1351,8 +1351,7 @@ static int set_serial_info(struct tty_st
+ 		goto check_and_exit;
+ 	}
+ 
+-	if ((new_serial.baud_base != priv->baud_base) &&
+-	    (new_serial.baud_base < 9600)) {
++	if (new_serial.baud_base != priv->baud_base) {
+ 	    	unlock_kernel();
+ 		return -EINVAL;
+ 	}
diff --git a/queue-2.6.32/usb-serial-ftdi-additional-ids.patch b/queue-2.6.32/usb-serial-ftdi-additional-ids.patch
new file mode 100644
index 0000000..ff97ad0
--- /dev/null
+++ b/queue-2.6.32/usb-serial-ftdi-additional-ids.patch
@@ -0,0 +1,45 @@
+From fc216ec363f4d174932df90bbf35c77d0540e561 Mon Sep 17 00:00:00 2001
+From: Peter Naulls <peter@chocky.org>
+Date: Tue, 17 Jan 2012 18:27:09 -0800
+Subject: USB: serial: ftdi additional IDs
+
+From: Peter Naulls <peter@chocky.org>
+
+commit fc216ec363f4d174932df90bbf35c77d0540e561 upstream.
+
+I tested this against 2.6.39 in the Ubuntu kernel, however I see the IDs
+are not in latest 3.2 git.
+
+This adds IDs for the FTDI controller in the Rainforest Automation
+Zigbee dongle.
+
+Signed-off-by: Peter Naulls <peter@chocky.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ftdi_sio.c     |    1 +
+ drivers/usb/serial/ftdi_sio_ids.h |    6 ++++++
+ 2 files changed, 7 insertions(+)
+
+--- a/drivers/usb/serial/ftdi_sio.c
++++ b/drivers/usb/serial/ftdi_sio.c
+@@ -844,6 +844,7 @@ static struct usb_device_id id_table_com
+ 		.driver_info = (kernel_ulong_t)&ftdi_jtag_quirk },
+ 	{ USB_DEVICE(ST_VID, ST_STMCLT1030_PID),
+ 		.driver_info = (kernel_ulong_t)&ftdi_stmclite_quirk },
++	{ USB_DEVICE(FTDI_VID, FTDI_RF_R106) },
+ 	{ },					/* Optional parameter entry */
+ 	{ }					/* Terminating entry */
+ };
+--- a/drivers/usb/serial/ftdi_sio_ids.h
++++ b/drivers/usb/serial/ftdi_sio_ids.h
+@@ -1180,3 +1180,9 @@
+  */
+ /* TagTracer MIFARE*/
+ #define FTDI_ZEITCONTROL_TAGTRACE_MIFARE_PID	0xF7C0
++
++/*
++ * Rainforest Automation
++ */
++/* ZigBee controller */
++#define FTDI_RF_R106		0x8A28