From 3ebf9b8da0341954c6e9f3fd0a974fe88fdeb5ae Mon Sep 17 00:00:00 2001 From: dann frazier Date: Fri, 17 Nov 2006 19:31:44 +0000 Subject: [PATCH] * The scope of the USR-61S2B unusual_dev entry was tightened, but too strictly. Loosen it to apply to additional devices with a smaller bcd. (closes: #396375) svn path=/dists/trunk/linux-2.6/; revision=7809 --- debian/changelog | 7 ++++- .../bugfix/UCR-61S2B-unusual_dev-update.patch | 30 +++++++++++++++++++ debian/patches/series/6 | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 debian/patches/bugfix/UCR-61S2B-unusual_dev-update.patch diff --git a/debian/changelog b/debian/changelog index d2ec7e071..44f9da77d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -41,7 +41,12 @@ linux-2.6 (2.6.18-6) UNRELEASED; urgency=low [ Thiemo Seufer ] * Enable raid456 for mips/mipsel qemu kernel. - -- maximilian attems Tue, 14 Nov 2006 10:20:32 +0100 + [ dann frazier ] + * The scope of the USR-61S2B unusual_dev entry was tightened, but too + strictly. Loosen it to apply to additional devices with a smaller bcd. + (closes: #396375) + + -- dann frazier Fri, 17 Nov 2006 12:28:17 -0700 linux-2.6 (2.6.18-5) unstable; urgency=low diff --git a/debian/patches/bugfix/UCR-61S2B-unusual_dev-update.patch b/debian/patches/bugfix/UCR-61S2B-unusual_dev-update.patch new file mode 100644 index 000000000..1f29c61cb --- /dev/null +++ b/debian/patches/bugfix/UCR-61S2B-unusual_dev-update.patch @@ -0,0 +1,30 @@ +From: Phil Dibowitz +Date: Fri, 3 Nov 2006 07:14:10 +0000 (-0800) +Subject: USB: Fix UCR-61S2B unusual_dev entry +X-Git-Url: http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=51b5bce8c253b82d4789161cc3b0c74bee313bb1 + +USB: Fix UCR-61S2B unusual_dev entry + +Recently this entry's bcd scope was narrowed so as not to falsly apply +to bcd's other than 0x0110. But while it breaks those of a larger bcd, +it is still needed for those of a smaller bcd - so this changes the +lower bcd limit to 0x0000. + +Signed-off-by: Phil Dibowitz +Signed-off-by: Greg Kroah-Hartman +--- + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -1323,8 +1323,10 @@ UNUSUAL_DEV( 0x0fce, 0xe030, 0x0000, 0x + /* Reported by Kevin Cernekee + * Tested on hardware version 1.10. + * Entry is needed only for the initializer function override. ++ * Devices with bcd > 110 seem to not need it while those ++ * with bcd < 110 appear to need it. + */ +-UNUSUAL_DEV( 0x1019, 0x0c55, 0x0110, 0x0110, ++UNUSUAL_DEV( 0x1019, 0x0c55, 0x0000, 0x0110, + "Desknote", + "UCR-61S2B", + US_SC_DEVICE, US_PR_DEVICE, usb_stor_ucr61s2b_init, diff --git a/debian/patches/series/6 b/debian/patches/series/6 index 86c7a62c2..c66b049de 100644 --- a/debian/patches/series/6 +++ b/debian/patches/series/6 @@ -18,3 +18,4 @@ + bugfix/scsi-SG_IO-data-direction.patch + bugfix/arm/versatile-pci.patch + bugfix/arm/nslu2-disk-leds.patch ++ bugfix/UCR-61S2B-unusual_dev-update.patch