usb and pci patches

2 files changed, 87 insertions, 0 deletions

diff --git a/usb/usb-lh7a40x-gadget-driver-fixed-a-dead-lock.patch b/usb/usb-lh7a40x-gadget-driver-fixed-a-dead-lock.patch
new file mode 100644
index 0000000000000..502c66487e7fc
--- /dev/null
+++ b/usb/usb-lh7a40x-gadget-driver-fixed-a-dead-lock.patch
@@ -0,0 +1,52 @@
+From vagabon.xyz@gmail.com Thu Feb 23 00:42:08 2006
+Message-ID: <cda58cb80602230035h43c7223dm@mail.gmail.com>
+Date: Thu, 23 Feb 2006 09:35:06 +0100
+From: "Franck Bui-Huu" <vagabon.xyz@gmail.com>
+Subject: USB: lh7a40x gadget driver: Fixed a dead lock
+Cc: "David Brownell" <david-b@pacbell.net>, greg@kroah.com
+Content-Disposition: inline
+
+There is a dead lock in lh7a40x udc driver. When the driver receive a
+SET_FEATURE HALT request, the dev lock is taken by the interrupt
+handler lh7a40x_udc_irq then the handler will call lh7a40x_set_halt
+function which in its turn will try to acquire the dev lock.
+
+Signed-off-by: Franck Bui-Huu <franck.bui-huu@innova-card.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/gadget/lh7a40x_udc.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/gadget/lh7a40x_udc.c
++++ gregkh-2.6/drivers/usb/gadget/lh7a40x_udc.c
+@@ -1062,11 +1062,11 @@ static int lh7a40x_ep_enable(struct usb_
+ 	ep->pio_irqs = 0;
+ 	ep->ep.maxpacket = le16_to_cpu(desc->wMaxPacketSize);
+ 
++	spin_unlock_irqrestore(&ep->dev->lock, flags);
++
+ 	/* Reset halt state (does flush) */
+ 	lh7a40x_set_halt(_ep, 0);
+ 
+-	spin_unlock_irqrestore(&ep->dev->lock, flags);
+-
+ 	DEBUG("%s: enabled %s\n", __FUNCTION__, _ep->name);
+ 	return 0;
+ }
+@@ -1775,6 +1775,7 @@ static void lh7a40x_ep0_setup(struct lh7
+ 					break;
+ 
+ 				qep = &dev->ep[ep_num];
++				spin_unlock(&dev->lock);
+ 				if (ctrl.bRequest == USB_REQ_SET_FEATURE) {
+ 					DEBUG_SETUP("SET_FEATURE (%d)\n",
+ 						    ep_num);
+@@ -1784,6 +1785,7 @@ static void lh7a40x_ep0_setup(struct lh7
+ 						    ep_num);
+ 					lh7a40x_set_halt(&qep->ep, 0);
+ 				}
++				spin_lock(&dev->lock);
+ 				usb_set_index(0);
+ 
+ 				/* Reply with a ZLP on next IN token */
diff --git a/usb/usb-unusual_devs-entry-for-lyra-rca-rd1080.patch b/usb/usb-unusual_devs-entry-for-lyra-rca-rd1080.patch
new file mode 100644
index 0000000000000..b51a79400b152
--- /dev/null
+++ b/usb/usb-unusual_devs-entry-for-lyra-rca-rd1080.patch
@@ -0,0 +1,35 @@
+From stern@rowland.harvard.edu Thu Feb 23 07:19:30 2006
+Date: Thu, 23 Feb 2006 10:19:25 -0500 (EST)
+From: Alan Stern <stern@rowland.harvard.edu>
+To: Greg KH <greg@kroah.com>
+cc: David Hamilton <niftimusmaximus@lycos.com>, Phil Dibowitz <phil@ipom.com>
+Subject: USB: unusual_devs entry for Lyra RCA RD1080
+Message-ID: <Pine.LNX.4.44L0.0602231013330.5204-100000@iolanthe.rowland.org>
+
+This patch (as656) adds an unusual_devs.h entry for the Lyra RCA RD1080
+MP3 player.  Its card-reader firmware has the common
+report-one-too-many-sectors bug.  This fixes Novell bug #152175.
+
+Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/storage/unusual_devs.h |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h
++++ gregkh-2.6/drivers/usb/storage/unusual_devs.h
+@@ -753,6 +753,13 @@ UNUSUAL_DEV(  0x0693, 0x0005, 0x0100, 0x
+ 		"Flashgate",
+ 		US_SC_SCSI, US_PR_BULK, NULL, 0 ), 
+ 
++/* Reported by David Hamilton <niftimusmaximus@lycos.com> */
++UNUSUAL_DEV(  0x069b, 0x3004, 0x0001, 0x0001,
++		"Thomson Multimedia Inc.",
++		"RCA RD1080 MP3 Player",
++		US_SC_DEVICE, US_PR_DEVICE, NULL,
++		US_FL_FIX_CAPACITY ),
++
+ UNUSUAL_DEV(  0x0781, 0x0001, 0x0200, 0x0200, 
+ 		"Sandisk",
+ 		"ImageMate SDDR-05a",