driver patches

5 files changed, 37 insertions, 5 deletions

diff --git a/usb/isp116x-hcd-cleanup.patch b/usb/isp116x-hcd-cleanup.patch
index c36a0ff9b481da..d08549e5e4caf6 100644
--- a/usb/isp116x-hcd-cleanup.patch
+++ b/usb/isp116x-hcd-cleanup.patch
@@ -767,7 +767,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  #else
 --- gregkh-2.6.orig/MAINTAINERS
 +++ gregkh-2.6/MAINTAINERS
-@@ -2641,6 +2641,12 @@ L:	linux-usb-users@lists.sourceforge.net
+@@ -2648,6 +2648,12 @@ L:	linux-usb-users@lists.sourceforge.net
  L:	linux-usb-devel@lists.sourceforge.net
  S:	Maintained
  
diff --git a/usb/uhci-add-missing-memory-barriers.patch b/usb/uhci-add-missing-memory-barriers.patch
index da6b104098ef9a..929791aa811029 100644
--- a/usb/uhci-add-missing-memory-barriers.patch
+++ b/usb/uhci-add-missing-memory-barriers.patch
@@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/drivers/usb/host/uhci-hcd.c
 +++ gregkh-2.6/drivers/usb/host/uhci-hcd.c
-@@ -710,6 +710,7 @@ static int uhci_suspend(struct usb_hcd *
+@@ -717,6 +717,7 @@ static int uhci_suspend(struct usb_hcd *
  	 * at the source, so we must turn off PIRQ.
  	 */
  	pci_write_config_word(to_pci_dev(uhci_dev(uhci)), USBLEGSUP, 0);
@@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
  	uhci->hc_inaccessible = 1;
  	hcd->poll_rh = 0;
-@@ -731,6 +732,7 @@ static int uhci_resume(struct usb_hcd *h
+@@ -738,6 +739,7 @@ static int uhci_resume(struct usb_hcd *h
  	 * really don't want to keep a stale HCD_FLAG_HW_ACCESSIBLE=0
  	 */
  	set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags);
diff --git a/usb/usb-storage-add-debug-entry-for-report-luns.patch b/usb/usb-storage-add-debug-entry-for-report-luns.patch
new file mode 100644
index 00000000000000..a66523ad590d7a
--- /dev/null
+++ b/usb/usb-storage-add-debug-entry-for-report-luns.patch
@@ -0,0 +1,32 @@
+From akpm@osdl.org Wed Nov 30 14:00:03 2005
+Message-Id: <200511302156.jAULuQ4M011629@shell0.pdx.osdl.net>
+From: Paul Walmsley <paul@booyaka.com>
+Subject: usb-storage: add debug entry for REPORT LUNS
+Subject: + usb-storage-add-debug-entry-for-report-luns.patch added to -mm tree
+To: paul@booyaka.com, greg@kroah.com, mdharm-usb@one-eyed-alien.net
+Date: Wed, 30 Nov 2005 13:57:45 -0800
+
+From: Paul Walmsley <paul@booyaka.com>
+
+Bugs involving the REPORT LUNS SCSI-3 command are much easier to track
+down if usb-storage displays the command's name, rather than "(Unknown
+command)".
+
+Signed-off-by: Paul Walmsley <paul@booyaka.com>
+Cc: <mdharm-usb@one-eyed-alien.net>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ drivers/usb/storage/debug.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- gregkh-2.6.orig/drivers/usb/storage/debug.c
++++ gregkh-2.6/drivers/usb/storage/debug.c
+@@ -132,6 +132,7 @@ void usb_stor_show_command(struct scsi_c
+ 	case 0x5C: what = "READ BUFFER CAPACITY"; break;
+ 	case 0x5D: what = "SEND CUE SHEET"; break;
+ 	case GPCMD_BLANK: what = "BLANK"; break;
++	case REPORT_LUNS: what = "REPORT LUNS"; break;
+ 	case MOVE_MEDIUM: what = "MOVE_MEDIUM or PLAY AUDIO (12)"; break;
+ 	case READ_12: what = "READ_12"; break;
+ 	case WRITE_12: what = "WRITE_12"; break;
diff --git a/usb/usb-storage-update-maintainers.patch b/usb/usb-storage-update-maintainers.patch
index 62102b7a90df52..65f980c87c30eb 100644
--- a/usb/usb-storage-update-maintainers.patch
+++ b/usb/usb-storage-update-maintainers.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- gregkh-2.6.orig/MAINTAINERS
 +++ gregkh-2.6/MAINTAINERS
-@@ -2658,7 +2658,7 @@ USB MASS STORAGE DRIVER
+@@ -2665,7 +2665,7 @@ USB MASS STORAGE DRIVER
  P:	Matthew Dharm
  M:	mdharm-usb@one-eyed-alien.net
  L:	linux-usb-users@lists.sourceforge.net
diff --git a/usb/usbcore-central-handling-for-host-controllers-that-were-reset-during-suspend-resume.patch b/usb/usbcore-central-handling-for-host-controllers-that-were-reset-during-suspend-resume.patch
index fcd99341e19af4..742d24eab39c94 100644
--- a/usb/usbcore-central-handling-for-host-controllers-that-were-reset-during-suspend-resume.patch
+++ b/usb/usbcore-central-handling-for-host-controllers-that-were-reset-during-suspend-resume.patch
@@ -102,7 +102,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  	 * style "resume" having let BIOS kick in during reboot.
 --- gregkh-2.6.orig/drivers/usb/host/uhci-hcd.c
 +++ gregkh-2.6/drivers/usb/host/uhci-hcd.c
-@@ -746,8 +746,12 @@ static int uhci_resume(struct usb_hcd *h
+@@ -748,8 +748,12 @@ static int uhci_resume(struct usb_hcd *h
  	check_and_reset_hc(uhci);
  	configure_hc(uhci);