r2023 - in trunk/kernel/source: kernel-source-2.6.8-2.6.8/debian kernel-source-2.6.8-2.6.8/debian/patches kernel-source-2.6.8-2.6.8/debian/patches/series kernel-source-2.6.9-2.6.9/debian kernel-source-2.6.9-2.6.9/debian/patches kernel-source-2.6.9-2.6.9/debian/patches/series

Andres Salomon dilinger-guest@haydn.debian.org
Thu, 23 Dec 2004 01:06:38 -0700


Author: dilinger-guest
Date: 2004-12-23 01:06:22 -0700 (Thu, 23 Dec 2004)
New Revision: 2023

Added:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-usb-storage-revoltec.dpatch
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-usb-storage-revoltec.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-11
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-4
Log:
  * Fix Revoltec USB burner problem introduced in 2.6.8.  Thanks
    to Ian Gulliver.  Note to other bug reporters: I accept bribes..
    (Andres Salomon) (closes: #285168).


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-12-23 07:37:52 UTC (rev 2022)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-12-23 08:06:22 UTC (rev 2023)
@@ -52,6 +52,10 @@
   * [SECURITY] Fix integer overflow in vc_resize.  Thanks to
     Fabio M. Di Nitto (Andres Salomon).
 
+  * Fix Revoltec USB burner problem introduced in 2.6.8.  Thanks
+    to Ian Gulliver.  Note to other bug reporters: I accept bribes..
+    (Andres Salomon) (closes: #285168).
+
  -- dann frazier <dannf@debian.org>  Fri, 03 Dec 2004 00:13:41 -0700
 
 kernel-source-2.6.8 (2.6.8-10) unstable; urgency=high

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-usb-storage-revoltec.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-usb-storage-revoltec.dpatch	2004-12-23 07:37:52 UTC (rev 2022)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/drivers-usb-storage-revoltec.dpatch	2004-12-23 08:06:22 UTC (rev 2023)
@@ -0,0 +1,85 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: USB: Remove inappropriate unusual_devs.h entry
+## DP: Patch author: Alan Stern <stern@rowland.harvard.edu>
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/09/03 13:31:41+02:00 stern@rowland.harvard.edu 
+#   [PATCH] USB: Remove inappropriate unusual_devs.h entry
+#   
+#   A couple of months ago you applied a patch from Torsten Scherer to create
+#   a new unusual_devs.h entry.  In further discussions with him I learned
+#   that the entry wasn't needed to access the device; the only reason for it
+#   was as a workaround for some old, buggy hotplug program on his system.
+#   
+#   Now Evan Fletcher reports that the entry actively prevents him from using
+#   his device.  For me that's the last straw, so here's a patch to remove the
+#   entry.  Torsten should be okay if he simply upgrades his hotplug package
+#   or removes the buggy program.
+#   
+#   On Mon, 30 Aug 2004, Evan Fletcher wrote:
+#   > Hi list,
+#   >
+#   > I have a Bytecc 5.25" External Enclosure, model ME-320U2F, that has
+#   > both USB 2.0 and Firewire connections
+#   > (http://www.byteccusa.com/product/enclosure/ME-320.htm).  It used to
+#   > work fine on earlier Linux 2.6 kernels, but stopped working a few
+#   > revisions ago.
+#   >
+#   > I tracked the problem down to an entry in unusual_devs.h:
+#   >
+#   > /* <torsten.scherer@uni-bielefeld.de>: I don't know the name of the bridge
+#   >  * manufacturer, but I've got an external USB drive by the Revoltec company
+#   >  * that needs this. otherwise the drive is recognized as /dev/sda, but any
+#   >  * access to it blocks indefinitely.
+#   >  */
+#   > UNUSUAL_DEV(  0x0402, 0x5621, 0x0103, 0x0103,
+#   >                 "Revoltec",
+#   >                 "USB/IDE Bridge (ATA/ATAPI)",
+#   >                 US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
+#   
+#   <...>
+#   > So, is there some way that this entry can be modified so that my DVD+R
+#   > works properly, and Mr. Scherer can still use his Revoltec external
+#   > disk?
+#   >
+#   > Thank you,
+#   > Evan Fletcher
+#   
+#   
+#   
+#   Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
+#   Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
+# 
+# drivers/usb/storage/unusual_devs.h
+#   2004/08/30 16:12:17+02:00 stern@rowland.harvard.edu +0 -10
+#   USB: Remove inappropriate unusual_devs.h entry
+# 
+diff -Nru a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
+--- a/drivers/usb/storage/unusual_devs.h	2004-12-22 23:57:24 -08:00
++++ b/drivers/usb/storage/unusual_devs.h	2004-12-22 23:57:24 -08:00
+@@ -68,16 +68,6 @@
+ 		US_SC_8070, US_PR_SCM_ATAPI, init_8200e, 0), 
+ #endif
+ 
+-/* <torsten.scherer@uni-bielefeld.de>: I don't know the name of the bridge
+- * manufacturer, but I've got an external USB drive by the Revoltec company
+- * that needs this. otherwise the drive is recognized as /dev/sda, but any
+- * access to it blocks indefinitely.
+- */
+-UNUSUAL_DEV(  0x0402, 0x5621, 0x0103, 0x0103,
+-		"Revoltec",
+-		"USB/IDE Bridge (ATA/ATAPI)",
+-		US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
+-
+ /* Deduced by Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
+  * Entry needed for flags: US_FL_FIX_INQUIRY because initial inquiry message
+  * always fails and confuses drive.

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-11
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-11	2004-12-23 07:37:52 UTC (rev 2022)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-11	2004-12-23 08:06:22 UTC (rev 2023)
@@ -15,3 +15,4 @@
 + reiserfs-sucks-2.patch
 + fix-ip-options-leak.dpatch
 + vt-of-death.dpatch
++ drivers-usb-storage-revoltec.dpatch

Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog	2004-12-23 07:37:52 UTC (rev 2022)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog	2004-12-23 08:06:22 UTC (rev 2023)
@@ -57,6 +57,10 @@
   * [SECURITY] Fix integer overflow in vc_resize.  Thanks to
     Fabio M. Di Nitto (Andres Salomon).
 
+  * Fix Revoltec USB burner problem introduced in 2.6.8.  Thanks
+    to Ian Gulliver.  Note to other bug reporters: I accept bribes..
+    (Andres Salomon) (closes: #285168).
+
  -- dann frazier <dannf@debian.org>  Fri, 03 Dec 2004 09:26:52 -0700
 
 kernel-source-2.6.9 (2.6.9-3) unstable; urgency=low

Added: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-usb-storage-revoltec.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-usb-storage-revoltec.dpatch	2004-12-23 07:37:52 UTC (rev 2022)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-usb-storage-revoltec.dpatch	2004-12-23 08:06:22 UTC (rev 2023)
@@ -0,0 +1,85 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: USB: Remove inappropriate unusual_devs.h entry
+## DP: Patch author: Alan Stern <stern@rowland.harvard.edu>
+## DP: Upstream status: backported
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2004/09/03 13:31:41+02:00 stern@rowland.harvard.edu 
+#   [PATCH] USB: Remove inappropriate unusual_devs.h entry
+#   
+#   A couple of months ago you applied a patch from Torsten Scherer to create
+#   a new unusual_devs.h entry.  In further discussions with him I learned
+#   that the entry wasn't needed to access the device; the only reason for it
+#   was as a workaround for some old, buggy hotplug program on his system.
+#   
+#   Now Evan Fletcher reports that the entry actively prevents him from using
+#   his device.  For me that's the last straw, so here's a patch to remove the
+#   entry.  Torsten should be okay if he simply upgrades his hotplug package
+#   or removes the buggy program.
+#   
+#   On Mon, 30 Aug 2004, Evan Fletcher wrote:
+#   > Hi list,
+#   >
+#   > I have a Bytecc 5.25" External Enclosure, model ME-320U2F, that has
+#   > both USB 2.0 and Firewire connections
+#   > (http://www.byteccusa.com/product/enclosure/ME-320.htm).  It used to
+#   > work fine on earlier Linux 2.6 kernels, but stopped working a few
+#   > revisions ago.
+#   >
+#   > I tracked the problem down to an entry in unusual_devs.h:
+#   >
+#   > /* <torsten.scherer@uni-bielefeld.de>: I don't know the name of the bridge
+#   >  * manufacturer, but I've got an external USB drive by the Revoltec company
+#   >  * that needs this. otherwise the drive is recognized as /dev/sda, but any
+#   >  * access to it blocks indefinitely.
+#   >  */
+#   > UNUSUAL_DEV(  0x0402, 0x5621, 0x0103, 0x0103,
+#   >                 "Revoltec",
+#   >                 "USB/IDE Bridge (ATA/ATAPI)",
+#   >                 US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
+#   
+#   <...>
+#   > So, is there some way that this entry can be modified so that my DVD+R
+#   > works properly, and Mr. Scherer can still use his Revoltec external
+#   > disk?
+#   >
+#   > Thank you,
+#   > Evan Fletcher
+#   
+#   
+#   
+#   Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
+#   Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
+# 
+# drivers/usb/storage/unusual_devs.h
+#   2004/08/30 16:12:17+02:00 stern@rowland.harvard.edu +0 -10
+#   USB: Remove inappropriate unusual_devs.h entry
+# 
+diff -Nru a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h
+--- a/drivers/usb/storage/unusual_devs.h	2004-12-22 23:57:24 -08:00
++++ b/drivers/usb/storage/unusual_devs.h	2004-12-22 23:57:24 -08:00
+@@ -68,16 +68,6 @@
+ 		US_SC_8070, US_PR_SCM_ATAPI, init_8200e, 0), 
+ #endif
+ 
+-/* <torsten.scherer@uni-bielefeld.de>: I don't know the name of the bridge
+- * manufacturer, but I've got an external USB drive by the Revoltec company
+- * that needs this. otherwise the drive is recognized as /dev/sda, but any
+- * access to it blocks indefinitely.
+- */
+-UNUSUAL_DEV(  0x0402, 0x5621, 0x0103, 0x0103,
+-		"Revoltec",
+-		"USB/IDE Bridge (ATA/ATAPI)",
+-		US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_FIX_INQUIRY),
+-
+ /* Deduced by Jonathan Woithe <jwoithe@physics.adelaide.edu.au>
+  * Entry needed for flags: US_FL_FIX_INQUIRY because initial inquiry message
+  * always fails and confuses drive.

Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-4
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-4	2004-12-23 07:37:52 UTC (rev 2022)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-4	2004-12-23 08:06:22 UTC (rev 2023)
@@ -17,3 +17,4 @@
 + reiserfs-sucks-2.patch
 + fix-ip-options-leak.dpatch
 + vt-of-death.dpatch
++ drivers-usb-storage-revoltec.dpatch