fix usb-storage patch for .27

diff --git a/queue-2.6.27/usb-storage-add-last-sector-hacks.patch b/queue-2.6.27/usb-storage-add-last-sector-hacks.patch
index 3e3c1d793f937d0fac442fcf9bea9e79fb7bedd9..06b8628267292838d5b07eeeec4dcfcd979b8703 100644 (file)
--- a/queue-2.6.27/usb-storage-add-last-sector-hacks.patch
+++ b/queue-2.6.27/usb-storage-add-last-sector-hacks.patch
@@ -49,11 +49,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  drivers/usb/storage/libusual.c     |    7 +++
  drivers/usb/storage/scsiglue.c     |    8 +++
  drivers/usb/storage/transport.c    |   80 +++++++++++++++++++++++++++++++++++++
- drivers/usb/storage/unusual_devs.h |   16 ++++++-
+ drivers/usb/storage/unusual_devs.h |   80 ++++++-------------------------------
  drivers/usb/storage/usb.c          |    6 ++
  drivers/usb/storage/usb.h          |    4 +
  include/linux/usb_usual.h          |    5 +-
- 7 files changed, 123 insertions(+), 3 deletions(-)
+ 7 files changed, 123 insertions(+), 67 deletions(-)
 
 --- a/drivers/usb/storage/libusual.c
 +++ b/drivers/usb/storage/libusual.c
@@ -237,7 +237,85 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  /* patch submitted by Vivian Bregier <Vivian.Bregier@imag.fr>
   */
  UNUSUAL_DEV(  0x03eb, 0x2002, 0x0100, 0x0100,
-@@ -692,6 +699,13 @@ UNUSUAL_DEV(  0x0525, 0xa140, 0x0100, 0x
+@@ -160,20 +167,6 @@ UNUSUAL_DEV(  0x0421, 0x0019, 0x0592, 0x
+               US_SC_DEVICE, US_PR_DEVICE, NULL,
+               US_FL_MAX_SECTORS_64 ),
+ 
+-/* Reported by Filip Joelsson <filip@blueturtle.nu> */
+-UNUSUAL_DEV(  0x0421, 0x005d, 0x0001, 0x0600,
+-              "Nokia",
+-              "Nokia 3110c",
+-              US_SC_DEVICE, US_PR_DEVICE, NULL,
+-              US_FL_FIX_CAPACITY ),
+-
+-/* Patch for Nokia 5310 capacity */
+-UNUSUAL_DEV(  0x0421, 0x006a, 0x0000, 0x0701,
+-              "Nokia",
+-              "5310",
+-              US_SC_DEVICE, US_PR_DEVICE, NULL,
+-              US_FL_FIX_CAPACITY ),
+-
+ /* Reported by Mario Rettig <mariorettig@web.de> */
+ UNUSUAL_DEV(  0x0421, 0x042e, 0x0100, 0x0100,
+               "Nokia",
+@@ -239,56 +232,6 @@ UNUSUAL_DEV(  0x0421, 0x0495, 0x0370, 0x
+               US_SC_DEVICE, US_PR_DEVICE, NULL,
+               US_FL_MAX_SECTORS_64 ),
+ 
+-/* Reported by Cedric Godin <cedric@belbone.be> */
+-UNUSUAL_DEV(  0x0421, 0x04b9, 0x0500, 0x0551,
+-              "Nokia",
+-              "5300",
+-              US_SC_DEVICE, US_PR_DEVICE, NULL,
+-              US_FL_FIX_CAPACITY ),
+-
+-/* Reported by Paulo Fessel <pfessel@gmail.com> */
+-UNUSUAL_DEV(  0x0421, 0x04bd, 0x0000, 0x9999,
+-              "Nokia",
+-              "5200",
+-              US_SC_DEVICE, US_PR_DEVICE, NULL,
+-              US_FL_FIX_CAPACITY ),
+-
+-/* Reported by Richard Nauber <RichardNauber@web.de> */
+-UNUSUAL_DEV(  0x0421, 0x04fa, 0x0550, 0x0660,
+-              "Nokia",
+-              "6300",
+-              US_SC_DEVICE, US_PR_DEVICE, NULL,
+-              US_FL_FIX_CAPACITY ),
+-
+-/* Reported by Ozan Sener <themgzzy@gmail.com> */
+-UNUSUAL_DEV(  0x0421, 0x0060, 0x0551, 0x0551,
+-              "Nokia",
+-              "3500c",
+-              US_SC_DEVICE, US_PR_DEVICE, NULL,
+-              US_FL_FIX_CAPACITY ),
+-
+-/* Reported by CSECSY Laszlo <boobaa@frugalware.org> */
+-UNUSUAL_DEV(  0x0421, 0x0063, 0x0001, 0x0601,
+-              "Nokia",
+-              "Nokia 3109c",
+-              US_SC_DEVICE, US_PR_DEVICE, NULL,
+-              US_FL_FIX_CAPACITY ),
+-
+-/* Patch for Nokia 5310 capacity */
+-UNUSUAL_DEV(  0x0421, 0x006a, 0x0000, 0x0591,
+-      "Nokia",
+-      "5310",
+-      US_SC_DEVICE, US_PR_DEVICE, NULL,
+-      US_FL_FIX_CAPACITY ),
+-
+-/* Submitted by Ricky Wong Yung Fei <evilbladewarrior@gmail.com> */
+-/* Nokia 7610 Supernova - Too many sectors reported in usb storage mode */
+-UNUSUAL_DEV(  0x0421, 0x00f5, 0x0000, 0x0470,
+-      "Nokia",
+-      "7610 Supernova",
+-      US_SC_DEVICE, US_PR_DEVICE, NULL,
+-      US_FL_FIX_CAPACITY ),
+-
+ /* Reported by Olaf Hering <olh@suse.de> from novell bug #105878 */
+ UNUSUAL_DEV(  0x0424, 0x0fdc, 0x0210, 0x0210,
+               "SMSC",
+@@ -692,6 +635,13 @@ UNUSUAL_DEV(  0x0525, 0xa140, 0x0100, 0x
                US_SC_8070, US_PR_DEVICE, NULL,
                US_FL_FIX_INQUIRY ),