[kernel] r13039 - in dists/lenny/linux-2.6/debian: . patches/bugfix/all patches/series

[Dann Frazier]

Author: dannf
Date: Mon Mar  9 04:47:17 2009
New Revision: 13039

Log:
Add USB mass storage quirk for "Kyocera / Contax SL300R T*" digital
cameras. (Closes: #518899)

Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/all/usb-unusual-dev-kyocera-contax-sl300r-t.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/patches/series/14

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	(original)
+++ dists/lenny/linux-2.6/debian/changelog	Mon Mar  9 04:47:17 2009
@@ -14,6 +14,8 @@
     - Support Asus P5Q Premium/Pro boards
     - Add support for ECS/PC Chips boards with Sigmatel codecs
     - Add support for Toshiba L305
+  * Add USB mass storage quirk for "Kyocera / Contax SL300R T*" digital
+    cameras. (Closes: #518899)
 
   [ dann frazier ]
   * Fix softlockups in sungem driver (Closes: #514624)
@@ -36,7 +38,7 @@
   * [nfs] Backport upstream patches to fix NFS "task blocked for more than 120
     seconds" issue (Closes: #518431)
 
- -- dann frazier <dannf at debian.org>  Fri, 13 Feb 2009 10:46:22 -0700
+ -- dann frazier <dannf at debian.org>  Sun, 08 Mar 2009 22:15:24 -0600
 
 linux-2.6 (2.6.26-13) unstable; urgency=high
 

Added: dists/lenny/linux-2.6/debian/patches/bugfix/all/usb-unusual-dev-kyocera-contax-sl300r-t.patch
==============================================================================
--- (empty file)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/all/usb-unusual-dev-kyocera-contax-sl300r-t.patch	Mon Mar  9 04:47:17 2009
@@ -0,0 +1,34 @@
+commit 74511bb340059be5a3fceb032213c7f325344694
+Author: Jens Taprogge <jens.taprogge at taprogge.org>
+Date:   Sun Oct 26 18:16:09 2008 +0100
+
+    USB: Unusual dev for the "Kyocera / Contax SL300R T*" digital camera.
+    
+    The camera reports an incorrect size and fails to handle PREVENT-ALLOW
+    MEDIUM REMOVAL commands.  The patch marks the camera as an unusual dev
+    and adds the flags to enable the workarounds for both shortcomings.
+    
+    Signed-off-by: Jens Taprogge <jens.taprogge at taprogge.org>
+    Cc: Alan Stern <stern at rowland.harvard.edu>
+    Cc: Phil Dibowitz <phil at ipom.com>
+    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+Adjusted to apply to Debian's 2.6.26 by dann frazier <dannf at debian.org>
+
+diff -urpN linux-source-2.6.26.orig/drivers/usb/storage/unusual_devs.h linux-source-2.6.26/drivers/usb/storage/unusual_devs.h
+--- linux-source-2.6.26.orig/drivers/usb/storage/unusual_devs.h	2009-02-07 16:43:12.000000000 -0700
++++ linux-source-2.6.26/drivers/usb/storage/unusual_devs.h	2009-03-08 22:10:12.000000000 -0600
+@@ -307,6 +307,13 @@ UNUSUAL_DEV(  0x0482, 0x0103, 0x0100, 0x
+ 		"Finecam S5",
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
+ 
++/* Patch submitted by Jens Taprogge <jens.taprogge at taprogge.org> */
++UNUSUAL_DEV(  0x0482, 0x0107, 0x0100, 0x0100,
++		"Kyocera",
++		"CONTAX SL300R T*",
++		US_SC_DEVICE, US_PR_DEVICE, NULL,
++		US_FL_FIX_CAPACITY | US_FL_NOT_LOCKABLE),
++
+ /* Reported by Paul Stewart <stewart at wetlogic.net>
+  * This entry is needed because the device reports Sub=ff */
+ UNUSUAL_DEV(  0x04a4, 0x0004, 0x0001, 0x0001,

Modified: dists/lenny/linux-2.6/debian/patches/series/14
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/14	(original)
+++ dists/lenny/linux-2.6/debian/patches/series/14	Mon Mar  9 04:47:17 2009
@@ -18,3 +18,4 @@
 + bugfix/mips/ip32-register-cmos.patch
 + bugfix/all/SUNRPC-Ensure-the-server-closes-sockets-in-a-timely.patch
 + bugfix/all/svc-Clean-up-deferred-requests-on-transport-destruc.patch
++ bugfix/all/usb-unusual-dev-kyocera-contax-sl300r-t.patch