diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-13 20:31:52 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-02-13 20:31:52 -0800 |
commit | fbbb494e404c3fa20bbbb1e49843443bb3be155a (patch) | |
tree | 087473c7233e95a8bfa0bd33460163fec1615fcd /usb | |
parent | 717e53d9e99894f6e0f35f63ba229093a8f1106c (diff) | |
download | patches-fbbb494e404c3fa20bbbb1e49843443bb3be155a.tar.gz |
new patches and 2.6.16-rc3 refresh
Diffstat (limited to 'usb')
-rw-r--r-- | usb/usb-add-zc0301-video4linux2-driver.patch | 2 | ||||
-rw-r--r-- | usb/usb-unusual-devs-bugfix.patch | 59 | ||||
-rw-r--r-- | usb/usb-unusual_devs.h-entry-iaudio-m5.patch | 33 | ||||
-rw-r--r-- | usb/usb-unusual_devs.h-entry-trekstor-i.beat.patch | 33 |
4 files changed, 126 insertions, 1 deletions
diff --git a/usb/usb-add-zc0301-video4linux2-driver.patch b/usb/usb-add-zc0301-video4linux2-driver.patch index 1875d8fdaf70c..978d31fa556bb 100644 --- a/usb/usb-add-zc0301-video4linux2-driver.patch +++ b/usb/usb-add-zc0301-video4linux2-driver.patch @@ -3006,7 +3006,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +#endif /* _ZC0301_SENSOR_H_ */ --- gregkh-2.6.orig/MAINTAINERS +++ gregkh-2.6/MAINTAINERS -@@ -2886,6 +2886,14 @@ L: video4linux-list@redhat.com +@@ -2902,6 +2902,14 @@ L: video4linux-list@redhat.com W: http://www.linux-projects.org S: Maintained diff --git a/usb/usb-unusual-devs-bugfix.patch b/usb/usb-unusual-devs-bugfix.patch new file mode 100644 index 0000000000000..569e0670bd42d --- /dev/null +++ b/usb/usb-unusual-devs-bugfix.patch @@ -0,0 +1,59 @@ +From phil@ipom.com Mon Feb 13 20:26:09 2006 +Message-ID: <43F11D6E.4050805@ipom.com> +Date: Mon, 13 Feb 2006 15:59:42 -0800 +From: Phil Dibowitz <phil@ipom.com> +To: Greg KH <greg@kroah.com>, <bohdan.linda@gmail.com> +Subject: USB: unusual-devs bugfix + +The following patch looks good to me. It adds an unusual_devs entry as +well as fixing an ordering bug. Please apply. + +From: Bohdan Linda <bohdan.linda@gmail.com> +Signed-off-by: Phil Dibowitz <phil@ipom.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/storage/unusual_devs.h | 25 ++++++++++++++++++------- + 1 file changed, 18 insertions(+), 7 deletions(-) + +--- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h ++++ gregkh-2.6/drivers/usb/storage/unusual_devs.h +@@ -134,6 +134,14 @@ UNUSUAL_DEV( 0x0436, 0x0005, 0x0100, 0x + US_SC_SCSI, US_PR_DPCM_USB, NULL, 0 ), + #endif + ++/* Patch submitted by Daniel Drake <dsd@gentoo.org> ++ * Device reports nonsense bInterfaceProtocol 6 when connected over USB2 */ ++UNUSUAL_DEV( 0x0451, 0x5416, 0x0100, 0x0100, ++ "Neuros Audio", ++ "USB 2.0 HD 2.5", ++ US_SC_DEVICE, US_PR_BULK, NULL, ++ US_FL_NEED_OVERRIDE ), ++ + /* + * Pete Zaitcev <zaitcev@yahoo.com>, from Patrick C. F. Ernzer, bz#162559. + * The key does not actually break, but it returns zero sense which +@@ -144,13 +152,16 @@ UNUSUAL_DEV( 0x0457, 0x0150, 0x0100, 0x + "USB Mass Storage Device", + US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ), + +-/* Patch submitted by Daniel Drake <dsd@gentoo.org> +- * Device reports nonsense bInterfaceProtocol 6 when connected over USB2 */ +-UNUSUAL_DEV( 0x0451, 0x5416, 0x0100, 0x0100, +- "Neuros Audio", +- "USB 2.0 HD 2.5", +- US_SC_DEVICE, US_PR_BULK, NULL, +- US_FL_NEED_OVERRIDE ), ++/* ++* Bohdan Linda <bohdan.linda@gmail.com> ++* 1GB USB sticks MyFlash High Speed. I have restricted ++* the revision to my model only ++*/ ++UNUSUAL_DEV( 0x0457, 0x0151, 0x0100, 0x0100, ++ "USB 2.0", ++ "Flash Disk", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_NOT_LOCKABLE ), + + UNUSUAL_DEV( 0x045a, 0x5210, 0x0101, 0x0101, + "Rio", diff --git a/usb/usb-unusual_devs.h-entry-iaudio-m5.patch b/usb/usb-unusual_devs.h-entry-iaudio-m5.patch new file mode 100644 index 0000000000000..2b3123003ae32 --- /dev/null +++ b/usb/usb-unusual_devs.h-entry-iaudio-m5.patch @@ -0,0 +1,33 @@ +From stern@rowland.harvard.edu Mon Feb 13 20:25:50 2006 +Date: Mon, 13 Feb 2006 10:16:04 -0500 (EST) +From: Alan Stern <stern@rowland.harvard.edu> +To: Greg KH <greg@kroah.com> +cc: Phil Dibowitz <phil@ipom.com> +Subject: USB: unusual_devs.h entry: iAUDIO M5 +Message-ID: <Pine.LNX.4.44L0.0602131015220.5121-100000@iolanthe.rowland.org> + +Another unusual_devs.h entry (as652). + +Signed-off-by: Alan Stern <stern@rowland.harvard.edu> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h ++++ gregkh-2.6/drivers/usb/storage/unusual_devs.h +@@ -1098,6 +1098,13 @@ UNUSUAL_DEV( 0x0dda, 0x0301, 0x0012, 0x + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_IGNORE_RESIDUE ), + ++/* Reported by Jim McCloskey <mcclosk@ucsc.edu> */ ++UNUSUAL_DEV( 0x0e21, 0x0520, 0x0100, 0x0100, ++ "Cowon Systems", ++ "iAUDIO M5", ++ US_SC_DEVICE, US_PR_BULK, NULL, ++ 0 ), ++ + /* Submitted by Antoine Mairesse <antoine.mairesse@free.fr> */ + UNUSUAL_DEV( 0x0ed1, 0x6660, 0x0100, 0x0300, + "USB", diff --git a/usb/usb-unusual_devs.h-entry-trekstor-i.beat.patch b/usb/usb-unusual_devs.h-entry-trekstor-i.beat.patch new file mode 100644 index 0000000000000..df8bb91a53fe9 --- /dev/null +++ b/usb/usb-unusual_devs.h-entry-trekstor-i.beat.patch @@ -0,0 +1,33 @@ +From stern@rowland.harvard.edu Mon Feb 13 20:25:28 2006 +Date: Mon, 13 Feb 2006 10:15:22 -0500 (EST) +From: Alan Stern <stern@rowland.harvard.edu> +To: Greg KH <greg@kroah.com> +cc: Phil Dibowitz <phil@ipom.com> +Subject: USB: unusual_devs.h entry: TrekStor i.Beat +Message-ID: <Pine.LNX.4.44L0.0602131012430.5121-100000@iolanthe.rowland.org> + +A new unusual_devs.h entry (as651). + +Signed-off-by: Alan Stern <stern@rowland.harvard.edu> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/storage/unusual_devs.h | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h ++++ gregkh-2.6/drivers/usb/storage/unusual_devs.h +@@ -106,6 +106,13 @@ UNUSUAL_DEV( 0x0411, 0x001c, 0x0113, 0x + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_FIX_INQUIRY ), + ++/* Reported by Christian Leber <christian@leber.de> */ ++UNUSUAL_DEV( 0x0419, 0xaaf5, 0x0100, 0x0100, ++ "TrekStor", ++ "i.Beat 115 2.0", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_IGNORE_RESIDUE | US_FL_NOT_LOCKABLE ), ++ + /* Reported by Stefan Werner <dustbln@gmx.de> */ + UNUSUAL_DEV( 0x0419, 0xaaf6, 0x0100, 0x0100, + "TrekStor", |