aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-03-14 10:49:04 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-14 10:49:04 -0800
commit1bce3d7a9fb6937d92c060656c0345a8de1f9015 (patch)
treef460d362a15f70e6d94f9370d8d67dcf906aeb3b /usb
parent85b9348e941df073c2c13d6668929e0477f043ee (diff)
downloadpatches-1bce3d7a9fb6937d92c060656c0345a8de1f9015.tar.gz
pci and usb patches
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-add-support-for-creativelabs-silvercrest-usb-keyboard.patch34
-rw-r--r--usb/usb-storage-another-unusual_devs.h-entry.patch35
-rw-r--r--usb/usb-storage-new-unusual_devs.h-entry-mitsumi-7in1-card-reader.patch37
-rw-r--r--usb/usb-storage-sandisk-unusual_devices-entry.patch45
-rw-r--r--usb/usb-storage-unusual_devs.h-entry-0420-0001.patch34
5 files changed, 185 insertions, 0 deletions
diff --git a/usb/usb-add-support-for-creativelabs-silvercrest-usb-keyboard.patch b/usb/usb-add-support-for-creativelabs-silvercrest-usb-keyboard.patch
new file mode 100644
index 0000000000000..e1559fd6a8e64
--- /dev/null
+++ b/usb/usb-add-support-for-creativelabs-silvercrest-usb-keyboard.patch
@@ -0,0 +1,34 @@
+From linux-usb-devel-admin@lists.sourceforge.net Wed Mar 8 08:00:38 2006
+From: Wolfgang Rohdewald <wolfgang@rohdewald.de>
+Subject: USB: add support for Creativelabs Silvercrest USB keyboard
+Content-Disposition: inline
+Message-Id: <200603081659.51267.wolfgang@rohdewald.de>
+Date: Wed, 8 Mar 2006 16:59:44 +0100
+
+Signed-off-by: Wolfgang Rohdewald <wolfgang@rohdewald.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/input/hid-core.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- gregkh-2.6.orig/drivers/usb/input/hid-core.c
++++ gregkh-2.6/drivers/usb/input/hid-core.c
+@@ -1552,6 +1552,9 @@ void hid_init_reports(struct hid_device
+ #define USB_VENDOR_ID_HP 0x03f0
+ #define USB_DEVICE_ID_HP_USBHUB_KB 0x020c
+
++#define USB_VENDOR_ID_CREATIVELABS 0x062a
++#define USB_DEVICE_ID_CREATIVELABS_SILVERCREST 0x0201
++
+ /*
+ * Alphabetically sorted blacklist by quirk type.
+ */
+@@ -1668,6 +1671,7 @@ static const struct hid_blacklist {
+ { USB_VENDOR_ID_ATEN, USB_DEVICE_ID_ATEN_4PORTKVMC, HID_QUIRK_NOGET },
+ { USB_VENDOR_ID_BTC, USB_DEVICE_ID_BTC_KEYBOARD, HID_QUIRK_NOGET},
+ { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, HID_QUIRK_NOGET},
++ { USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVELABS_SILVERCREST, HID_QUIRK_NOGET },
+ { USB_VENDOR_ID_HP, USB_DEVICE_ID_HP_USBHUB_KB, HID_QUIRK_NOGET },
+ { USB_VENDOR_ID_TANGTOP, USB_DEVICE_ID_TANGTOP_USBPS2, HID_QUIRK_NOGET },
+ { USB_VENDOR_ID_WISEGROUP, USB_DEVICE_ID_DUAL_USB_JOYPAD, HID_QUIRK_NOGET | HID_QUIRK_MULTI_INPUT },
diff --git a/usb/usb-storage-another-unusual_devs.h-entry.patch b/usb/usb-storage-another-unusual_devs.h-entry.patch
new file mode 100644
index 0000000000000..4008b1c66305e
--- /dev/null
+++ b/usb/usb-storage-another-unusual_devs.h-entry.patch
@@ -0,0 +1,35 @@
+From phil@ipom.com Sun Mar 5 21:43:46 2006
+Message-ID: <440BCC0C.1090103@ipom.com>
+Date: Sun, 05 Mar 2006 21:43:40 -0800
+From: Phil Dibowitz <phil@ipom.com>
+To: Greg KH <greg@kroah.com>, <chris@rebelbase.com>, <zaitcev@redhat.com>
+Subject: USB: storage: another unusual_devs.h entry
+
+From: Pete Zaitcev <zaitcev@redhat.com>
+
+Signed-off-by: Phil Dibowitz <phil@ipom.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/storage/unusual_devs.h | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h
++++ gregkh-2.6/drivers/usb/storage/unusual_devs.h
+@@ -1080,6 +1080,16 @@ UNUSUAL_DEV( 0x0c0b, 0xa109, 0x0000, 0xf
+ 0),
+ #endif
+
++/*
++ * Pete Zaitcev <zaitcev@yahoo.com>, bz#164688.
++ * The device blatantly ignores LUN and returns 1 in GetMaxLUN.
++ */
++UNUSUAL_DEV( 0x0c45, 0x1060, 0x0100, 0x0100,
++ "Unknown",
++ "Unknown",
++ US_SC_DEVICE, US_PR_DEVICE, NULL,
++ US_FL_SINGLE_LUN ),
++
+ /* Submitted by Joris Struyve <joris@struyve.be> */
+ UNUSUAL_DEV( 0x0d96, 0x410a, 0x0001, 0xffff,
+ "Medion",
diff --git a/usb/usb-storage-new-unusual_devs.h-entry-mitsumi-7in1-card-reader.patch b/usb/usb-storage-new-unusual_devs.h-entry-mitsumi-7in1-card-reader.patch
new file mode 100644
index 0000000000000..7428f1225b8aa
--- /dev/null
+++ b/usb/usb-storage-new-unusual_devs.h-entry-mitsumi-7in1-card-reader.patch
@@ -0,0 +1,37 @@
+From stern@rowland.harvard.edu Mon Mar 6 07:45:50 2006
+Date: Mon, 6 Mar 2006 10:45:42 -0500 (EST)
+From: Alan Stern <stern@rowland.harvard.edu>
+To: Greg KH <greg@kroah.com>
+cc: "Rodolfo Quesada Z." <rquesada@eml.cc>, Phil Dibowitz <phil@ipom.com>
+Subject: USB: storage: new unusual_devs.h entry: Mitsumi 7in1 Card Reader
+Message-ID: <Pine.LNX.4.44L0.0603061042190.5142-100000@iolanthe.rowland.org>
+
+From: Rodolfo Quesada <rquesada@roqz.net>
+
+This patch (as661) adds an unusual_devs entry for the Mitsumi 7in1 Card
+Reader.
+
+From: Rodolfo Quesada <rquesada@roqz.net>
+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
+@@ -62,6 +62,13 @@ UNUSUAL_DEV( 0x03ee, 0x6901, 0x0000, 0x
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_SINGLE_LUN ),
+
++/* Reported by Rodolfo Quesada <rquesada@roqz.net> */
++UNUSUAL_DEV( 0x03ee, 0x6906, 0x0003, 0x0003,
++ "VIA Technologies Inc.",
++ "Mitsumi multi cardreader",
++ US_SC_DEVICE, US_PR_DEVICE, NULL,
++ US_FL_IGNORE_RESIDUE ),
++
+ UNUSUAL_DEV( 0x03f0, 0x0107, 0x0200, 0x0200,
+ "HP",
+ "CD-Writer+",
diff --git a/usb/usb-storage-sandisk-unusual_devices-entry.patch b/usb/usb-storage-sandisk-unusual_devices-entry.patch
new file mode 100644
index 0000000000000..3f9895e62d20c
--- /dev/null
+++ b/usb/usb-storage-sandisk-unusual_devices-entry.patch
@@ -0,0 +1,45 @@
+From phil@ipom.com Sun Mar 5 21:36:56 2006
+Message-ID: <440BCA73.1050904@ipom.com>
+Date: Sun, 05 Mar 2006 21:36:51 -0800
+From: Phil Dibowitz <phil@ipom.com>
+To: Roman Hodek <roman@hodek.net>, Greg KH <greg@kroah.com>
+Subject: USB: storage: sandisk unusual_devices entry
+
+
+The following adds an unusual_devs entry for the SanDisk ImageMate CompactFlash
+USB drive, for the US_FL_FIX_CAPACITY flag. Additionally, it removes trailing
+whitespace from the previous entry. It's based on the patch sent by Roman Hodek
+<roman@hodek.net>.
+
+Signed-off-by: Phil Dibowitz <phil@ipom.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+
+
+---
+ drivers/usb/storage/unusual_devs.h | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+--- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h
++++ gregkh-2.6/drivers/usb/storage/unusual_devs.h
+@@ -760,12 +760,19 @@ UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY ),
+
+-UNUSUAL_DEV( 0x0781, 0x0001, 0x0200, 0x0200,
++/* Submitted by Roman Hodek <roman@hodek.net> */
++UNUSUAL_DEV( 0x0781, 0x0001, 0x0200, 0x0200,
+ "Sandisk",
+ "ImageMate SDDR-05a",
+ US_SC_SCSI, US_PR_CB, NULL,
+ US_FL_SINGLE_LUN ),
+
++UNUSUAL_DEV( 0x0781, 0x0002, 0x0009, 0x0009,
++ "SanDisk Corporation",
++ "ImageMate CompactFlash USB",
++ US_SC_DEVICE, US_PR_DEVICE, NULL,
++ US_FL_FIX_CAPACITY ),
++
+ #ifdef CONFIG_USB_STORAGE_USBAT
+ UNUSUAL_DEV( 0x0781, 0x0005, 0x0005, 0x0005,
+ "Sandisk",
diff --git a/usb/usb-storage-unusual_devs.h-entry-0420-0001.patch b/usb/usb-storage-unusual_devs.h-entry-0420-0001.patch
new file mode 100644
index 0000000000000..9aa41aae402c0
--- /dev/null
+++ b/usb/usb-storage-unusual_devs.h-entry-0420-0001.patch
@@ -0,0 +1,34 @@
+From phil@ipom.com Sun Mar 5 21:45:49 2006
+Message-ID: <440BCC88.4040001@ipom.com>
+Date: Sun, 05 Mar 2006 21:45:44 -0800
+From: Phil Dibowitz <phil@ipom.com>
+To: Greg KH <greg@kroah.com>, <zaitcev@redhat.com>, <chris@rebelbase.com>
+Subject: USB: storage: unusual_devs.h entry 0420:0001
+
+From: Pete Zaitcev <zaitcev@redhat.com>
+
+Ref
+https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176584
+
+Signed-off-by: Phil Dibowitz <phil@ipom.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/storage/unusual_devs.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h
++++ gregkh-2.6/drivers/usb/storage/unusual_devs.h
+@@ -120,6 +120,12 @@ UNUSUAL_DEV( 0x0419, 0xaaf6, 0x0100, 0x
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_IGNORE_RESIDUE ),
+
++/* Reported by Pete Zaitcev <zaitcev@redhat.com>, bz#176584 */
++UNUSUAL_DEV( 0x0420, 0x0001, 0x0100, 0x0100,
++ "GENERIC", "MP3 PLAYER", /* MyMusix PD-205 on the outside. */
++ US_SC_DEVICE, US_PR_DEVICE, NULL,
++ US_FL_IGNORE_RESIDUE ),
++
+ /* Reported by Olaf Hering <olh@suse.de> from novell bug #105878 */
+ UNUSUAL_DEV( 0x0424, 0x0fdc, 0x0210, 0x0210,
+ "SMSC",