2.6.15-rc6-git3 refresh

2 files changed, 0 insertions, 105 deletions

diff --git a/usb/usb-storage-force-starget-scsi_level-in-usb-storage-scsiglue.c.patch b/usb/usb-storage-force-starget-scsi_level-in-usb-storage-scsiglue.c.patch
deleted file mode 100644
index f941d64fb6390..0000000000000
--- a/usb/usb-storage-force-starget-scsi_level-in-usb-storage-scsiglue.c.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From paul@booyaka.com Tue Nov 29 19:20:38 2005
-Date: Tue, 29 Nov 2005 19:20:38 -0700 (MST)
-From: Paul Walmsley <paul@booyaka.com>
-To: <mdharm-usb@one-eyed-alien.net>
-Subject: USB Storage: Force starget->scsi_level in usb-storage scsiglue.c
-
-When the usb-storage module forces sdev->scsi_level to SCSI_2, it should
-also force starget->scsi_level to the same value.  Otherwise, the SCSI
-layer may attempt to issue SCSI-3 commands to the device, such as REPORT
-LUNS, which it cannot handle.  This can prevent the device from working
-with Linux.
-
-The AMS Venus DS3 DS2316SU2S SATA-to-SATA+USB enclosure, based on the
-Oxford Semiconductor OXU921S chip, requires this patch to function
-correctly on Linux.  The enclosure reports a SCSI-3 SPC-2 command set
-level, but does not correctly handle the REPORT LUNS SCSI command -
-probably due to a bug in its firmware.
-
-It seems likely that other USB storage enclosures with similar bugs will
-also benefit from this patch.
-
-Tony Lindgren <tony@atomide.com> collaborated in the development of this
-patch.
-
-Signed-off-by: Paul Walmsley <paul@booyaka.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/storage/scsiglue.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- gregkh-2.6.orig/drivers/usb/storage/scsiglue.c
-+++ gregkh-2.6/drivers/usb/storage/scsiglue.c
-@@ -109,7 +109,7 @@ static int slave_configure(struct scsi_d
- 	 * data comes from.
- 	 */
- 	if (sdev->scsi_level < SCSI_2)
--		sdev->scsi_level = SCSI_2;
-+		sdev->scsi_level = sdev->sdev_target->scsi_level = SCSI_2;
- 
- 	/* According to the technical support people at Genesys Logic,
- 	 * devices using their chips have problems transferring more than
-@@ -162,7 +162,7 @@ static int slave_configure(struct scsi_d
- 		 * a Get-Max-LUN request, we won't lose much by setting the
- 		 * revision level down to 2.  The only devices that would be
- 		 * affected are those with sparse LUNs. */
--		sdev->scsi_level = SCSI_2;
-+		sdev->scsi_level = sdev->sdev_target->scsi_level = SCSI_2;
- 
- 		/* USB-IDE bridges tend to report SK = 0x04 (Non-recoverable
- 		 * Hardware Error) when any low-level error occurs,
diff --git a/usb/usbcore-allow-suspend-resume-even-if-drivers-don-t-support-it.patch b/usb/usbcore-allow-suspend-resume-even-if-drivers-don-t-support-it.patch
deleted file mode 100644
index a7489f33c3a8c..0000000000000
--- a/usb/usbcore-allow-suspend-resume-even-if-drivers-don-t-support-it.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From stern@rowland.harvard.edu Wed Dec 14 09:39:01 2005
-Date: Wed, 14 Dec 2005 12:22:17 -0500 (EST)
-From: Alan Stern <stern@rowland.harvard.edu>
-To: Greg KH <greg@kroah.com>
-cc: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2005@gmx.net>
-Subject: [PATCH] usbcore: allow suspend/resume even if drivers don't support it
-Message-ID: <Pine.LNX.4.44L0.0512141215510.7421-100000@iolanthe.rowland.org>
-
-This patch (as618) changes usbcore to prevent derailing the
-suspend/resume sequence when a USB driver doesn't include support for
-it.  This is a workaround rather than a true fix; the core needs to be
-changed so that URB submissions from suspended drivers can be refused
-and outstanding URBs cancelled.
-
-Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/core/usb.c |    9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
---- gregkh-2.6.orig/drivers/usb/core/usb.c
-+++ gregkh-2.6/drivers/usb/core/usb.c
-@@ -1428,7 +1428,8 @@ static int usb_generic_suspend(struct de
- 			mark_quiesced(intf);
- 	} else {
- 		// FIXME else if there's no suspend method, disconnect...
--		dev_warn(dev, "no %s?\n", "suspend");
-+		dev_warn(dev, "no suspend for driver %s?\n", driver->name);
-+		mark_quiesced(intf);
- 		status = 0;
- 	}
- 	return status;
-@@ -1456,8 +1457,10 @@ static int usb_generic_resume(struct dev
- 	}
- 
- 	if ((dev->driver == NULL) ||
--	    (dev->driver_data == &usb_generic_driver_data))
-+	    (dev->driver_data == &usb_generic_driver_data)) {
-+		dev->power.power_state.event = PM_EVENT_FREEZE;
- 		return 0;
-+	}
- 
- 	intf = to_usb_interface(dev);
- 	driver = to_usb_driver(dev->driver);
-@@ -1477,7 +1480,7 @@ static int usb_generic_resume(struct dev
- 			mark_quiesced(intf);
- 		}
- 	} else
--		dev_warn(dev, "no %s?\n", "resume");
-+		dev_warn(dev, "no resume for driver %s?\n", driver->name);
- 	return 0;
- }
-