aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-03-01 10:14:44 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2006-03-01 10:14:44 -0800
commite946d6a860ccbbc527c85411ff97104eb7904018 (patch)
treeecddde5589c13a033154de7b15c09d00ce37e992 /usb
parent4634b35a4380b9000c186e38952320507d109f1e (diff)
downloadpatches-e946d6a860ccbbc527c85411ff97104eb7904018.tar.gz
removed patches already in 2.6.16-rc5-git4
Diffstat (limited to 'usb')
-rw-r--r--usb/ftdi_sio-new-microham-device-ids.patch63
-rw-r--r--usb/usb-fix-ehci-bios-handshake.patch46
-rw-r--r--usb/usb-gadget-rndis-fix-alloc-bug.patch43
-rw-r--r--usb/usb-lh7a40x-gadget-driver-fixed-a-dead-lock.patch52
-rw-r--r--usb/usb-unusual_devs-entry-for-lyra-rca-rd1080.patch35
-rw-r--r--usb/usb-visor.c-id-for-gspda-smartphone.patch49
-rw-r--r--usb/wisegroup-mp-8866-dual-usb-joypad.patch38
7 files changed, 0 insertions, 326 deletions
diff --git a/usb/ftdi_sio-new-microham-device-ids.patch b/usb/ftdi_sio-new-microham-device-ids.patch
deleted file mode 100644
index 70fce24195279..0000000000000
--- a/usb/ftdi_sio-new-microham-device-ids.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From ian.abbott@mev.co.uk Mon Feb 27 06:05:55 2006
-Message-ID: <4403072C.6050602@mev.co.uk>
-Date: Mon, 27 Feb 2006 14:05:32 +0000
-From: Ian Abbott <abbotti@mev.co.uk>
-Cc: Greg KH <greg@kroah.com>, ftdi-usb-sio-devel@lists.sourceforge.net, Mike Studer <k6eep@hamsoftware.org>
-Subject: [PATCH 2.6.16-rc5] ftdi_sio: new microHAM device IDs
-
-From: Ian Abbott <abbotti@mev.co.uk>
-
-This patch adds a bunch of new device IDs to the ftdi_sio driver for
-various devices from microHAM using FTDI chips.
-
-Micheal Studer supplied the PID for the USB-Y9 device. I examined the
-INF file in microHAM's Windows driver package for the USB-KW, USB-YS,
-USB-IC, USB-DB9 and USB-RS232 devices.
-
-Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/ftdi_sio.c | 6 ++++++
- drivers/usb/serial/ftdi_sio.h | 10 +++++++++-
- 2 files changed, 15 insertions(+), 1 deletion(-)
-
---- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.c
-+++ gregkh-2.6/drivers/usb/serial/ftdi_sio.c
-@@ -469,8 +469,14 @@ static struct usb_device_id id_table_com
- { USB_DEVICE(FTDI_VID, XSENS_CONVERTER_7_PID) },
- { USB_DEVICE(MOBILITY_VID, MOBILITY_USB_SERIAL_PID) },
- { USB_DEVICE(FTDI_VID, FTDI_ACTIVE_ROBOTS_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_MHAM_KW_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_MHAM_YS_PID) },
- { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y6_PID) },
- { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y8_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_MHAM_IC_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_MHAM_DB9_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_MHAM_RS232_PID) },
-+ { USB_DEVICE(FTDI_VID, FTDI_MHAM_Y9_PID) },
- { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_VCP_PID) },
- { USB_DEVICE(FTDI_VID, FTDI_TERATRONIK_D2XX_PID) },
- { USB_DEVICE(EVOLUTION_VID, EVOLUTION_ER1_PID) },
---- gregkh-2.6.orig/drivers/usb/serial/ftdi_sio.h
-+++ gregkh-2.6/drivers/usb/serial/ftdi_sio.h
-@@ -333,10 +333,18 @@
-
- /*
- * microHAM product IDs (http://www.microham.com).
-- * Submitted by Justin Burket (KL1RL) <zorton@jtan.com>.
-+ * Submitted by Justin Burket (KL1RL) <zorton@jtan.com>
-+ * and Mike Studer (K6EEP) <k6eep@hamsoftware.org>.
-+ * Ian Abbott <abbotti@mev.co.uk> added a few more from the driver INF file.
- */
-+#define FTDI_MHAM_KW_PID 0xEEE8 /* USB-KW interface */
-+#define FTDI_MHAM_YS_PID 0xEEE9 /* USB-YS interface */
- #define FTDI_MHAM_Y6_PID 0xEEEA /* USB-Y6 interface */
- #define FTDI_MHAM_Y8_PID 0xEEEB /* USB-Y8 interface */
-+#define FTDI_MHAM_IC_PID 0xEEEC /* USB-IC interface */
-+#define FTDI_MHAM_DB9_PID 0xEEED /* USB-DB9 interface */
-+#define FTDI_MHAM_RS232_PID 0xEEEE /* USB-RS232 interface */
-+#define FTDI_MHAM_Y9_PID 0xEEEF /* USB-Y9 interface */
-
- /*
- * Active Robots product ids.
diff --git a/usb/usb-fix-ehci-bios-handshake.patch b/usb/usb-fix-ehci-bios-handshake.patch
deleted file mode 100644
index 01fac20bda17e..0000000000000
--- a/usb/usb-fix-ehci-bios-handshake.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From akpm@osdl.org Fri Feb 24 16:53:44 2006
-Message-Id: <200602250053.k1P0rdJH016580@shell0.pdx.osdl.net>
-Subject: USB: fix EHCI BIOS handshake
-To: david-b@pacbell.net, dbrownell@users.sourceforge.net, greg@kroah.com,
- yazar256@gmail.com, mm-commits@vger.kernel.org
-From: David Brownell <david-b@pacbell.net>
-Date: Fri, 24 Feb 2006 16:55:52 -0800
-
-From: David Brownell <david-b@pacbell.net>
-
-Fix http://bugzilla.kernel.org/show_bug.cgi?id=6128
-
-Finish morphing the "early handoff" version of the EHCI BIOS handshake over
-to match the previous implementation inside the EHCI driver (except that
-now we forcibly disable the SMI). The version that had been with the PCI
-code was surprisingly full of bugs.
-
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Cc: <yazar256@gmail.com>
-Signed-off-by: Andrew Morton <akpm@osdl.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
- drivers/usb/host/pci-quirks.c | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
---- gregkh-2.6.orig/drivers/usb/host/pci-quirks.c
-+++ gregkh-2.6/drivers/usb/host/pci-quirks.c
-@@ -260,12 +260,13 @@ static void __devinit quirk_usb_disable_
- offset + EHCI_USBLEGCTLSTS,
- val | EHCI_USBLEGCTLSTS_SOOE);
- #endif
-- }
-
-- /* always say Linux will own the hardware
-- * by setting EHCI_USBLEGSUP_OS.
-- */
-- pci_write_config_byte(pdev, offset + 3, 1);
-+ /* some systems get upset if this semaphore is
-+ * set for any other reason than forcing a BIOS
-+ * handoff..
-+ */
-+ pci_write_config_byte(pdev, offset + 3, 1);
-+ }
-
- /* if boot firmware now owns EHCI, spin till
- * it hands it over.
diff --git a/usb/usb-gadget-rndis-fix-alloc-bug.patch b/usb/usb-gadget-rndis-fix-alloc-bug.patch
deleted file mode 100644
index 0b9e9a26f47a5..0000000000000
--- a/usb/usb-gadget-rndis-fix-alloc-bug.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From david-b@pacbell.net Wed Feb 22 19:47:23 2006
-From: Shaun Tancheff <shaun@tancheff.com>
-Subject: USB: Gadget RNDIS fix alloc bug. (buffer overflow)
-Date: Wed, 22 Feb 2006 19:47:19 -0800
-To: Greg KH <gregkh@suse.de>
-Cc: Robert Schwebel <r.schwebel@pengutronix.de>, Shaun Tancheff <shaun@tancheff.com>
-Content-Disposition: inline
-Message-Id: <200602221947.20100.david-b@pacbell.net>
-
-From: Shaun Tancheff <shaun@tancheff.com>
-
-Remote NDIS response to OID_GEN_SUPPORTED_LIST only allocated space
-for the data attached to the reply, and not the reply structure
-itself. This caused other kmalloc'd memory to be corrupted.
-
-Signed-off-by: Shaun Tancheff <shaun@tancheff.com>
-Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
- drivers/usb/gadget/rndis.c | 11 +++++++----
- 1 file changed, 7 insertions(+), 4 deletions(-)
-
---- gregkh-2.6.orig/drivers/usb/gadget/rndis.c
-+++ gregkh-2.6/drivers/usb/gadget/rndis.c
-@@ -853,11 +853,14 @@ static int rndis_query_response (int con
- // DEBUG("%s: OID = %08X\n", __FUNCTION__, cpu_to_le32(buf->OID));
- if (!rndis_per_dev_params [configNr].dev) return -ENOTSUPP;
-
-- /*
-- * we need more memory:
-- * oid_supported_list is the largest answer
-+ /*
-+ * we need more memory:
-+ * gen_ndis_query_resp expects enough space for
-+ * rndis_query_cmplt_type followed by data.
-+ * oid_supported_list is the largest data reply
- */
-- r = rndis_add_response (configNr, sizeof (oid_supported_list));
-+ r = rndis_add_response (configNr,
-+ sizeof (oid_supported_list) + sizeof(rndis_query_cmplt_type));
- if (!r)
- return -ENOMEM;
- resp = (rndis_query_cmplt_type *) r->buf;
diff --git a/usb/usb-lh7a40x-gadget-driver-fixed-a-dead-lock.patch b/usb/usb-lh7a40x-gadget-driver-fixed-a-dead-lock.patch
deleted file mode 100644
index 502c66487e7fc..0000000000000
--- a/usb/usb-lh7a40x-gadget-driver-fixed-a-dead-lock.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From vagabon.xyz@gmail.com Thu Feb 23 00:42:08 2006
-Message-ID: <cda58cb80602230035h43c7223dm@mail.gmail.com>
-Date: Thu, 23 Feb 2006 09:35:06 +0100
-From: "Franck Bui-Huu" <vagabon.xyz@gmail.com>
-Subject: USB: lh7a40x gadget driver: Fixed a dead lock
-Cc: "David Brownell" <david-b@pacbell.net>, greg@kroah.com
-Content-Disposition: inline
-
-There is a dead lock in lh7a40x udc driver. When the driver receive a
-SET_FEATURE HALT request, the dev lock is taken by the interrupt
-handler lh7a40x_udc_irq then the handler will call lh7a40x_set_halt
-function which in its turn will try to acquire the dev lock.
-
-Signed-off-by: Franck Bui-Huu <franck.bui-huu@innova-card.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/gadget/lh7a40x_udc.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
---- gregkh-2.6.orig/drivers/usb/gadget/lh7a40x_udc.c
-+++ gregkh-2.6/drivers/usb/gadget/lh7a40x_udc.c
-@@ -1062,11 +1062,11 @@ static int lh7a40x_ep_enable(struct usb_
- ep->pio_irqs = 0;
- ep->ep.maxpacket = le16_to_cpu(desc->wMaxPacketSize);
-
-+ spin_unlock_irqrestore(&ep->dev->lock, flags);
-+
- /* Reset halt state (does flush) */
- lh7a40x_set_halt(_ep, 0);
-
-- spin_unlock_irqrestore(&ep->dev->lock, flags);
--
- DEBUG("%s: enabled %s\n", __FUNCTION__, _ep->name);
- return 0;
- }
-@@ -1775,6 +1775,7 @@ static void lh7a40x_ep0_setup(struct lh7
- break;
-
- qep = &dev->ep[ep_num];
-+ spin_unlock(&dev->lock);
- if (ctrl.bRequest == USB_REQ_SET_FEATURE) {
- DEBUG_SETUP("SET_FEATURE (%d)\n",
- ep_num);
-@@ -1784,6 +1785,7 @@ static void lh7a40x_ep0_setup(struct lh7
- ep_num);
- lh7a40x_set_halt(&qep->ep, 0);
- }
-+ spin_lock(&dev->lock);
- usb_set_index(0);
-
- /* Reply with a ZLP on next IN token */
diff --git a/usb/usb-unusual_devs-entry-for-lyra-rca-rd1080.patch b/usb/usb-unusual_devs-entry-for-lyra-rca-rd1080.patch
deleted file mode 100644
index b51a79400b152..0000000000000
--- a/usb/usb-unusual_devs-entry-for-lyra-rca-rd1080.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From stern@rowland.harvard.edu Thu Feb 23 07:19:30 2006
-Date: Thu, 23 Feb 2006 10:19:25 -0500 (EST)
-From: Alan Stern <stern@rowland.harvard.edu>
-To: Greg KH <greg@kroah.com>
-cc: David Hamilton <niftimusmaximus@lycos.com>, Phil Dibowitz <phil@ipom.com>
-Subject: USB: unusual_devs entry for Lyra RCA RD1080
-Message-ID: <Pine.LNX.4.44L0.0602231013330.5204-100000@iolanthe.rowland.org>
-
-This patch (as656) adds an unusual_devs.h entry for the Lyra RCA RD1080
-MP3 player. Its card-reader firmware has the common
-report-one-too-many-sectors bug. This fixes Novell bug #152175.
-
-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
-@@ -753,6 +753,13 @@ UNUSUAL_DEV( 0x0693, 0x0005, 0x0100, 0x
- "Flashgate",
- US_SC_SCSI, US_PR_BULK, NULL, 0 ),
-
-+/* Reported by David Hamilton <niftimusmaximus@lycos.com> */
-+UNUSUAL_DEV( 0x069b, 0x3004, 0x0001, 0x0001,
-+ "Thomson Multimedia Inc.",
-+ "RCA RD1080 MP3 Player",
-+ US_SC_DEVICE, US_PR_DEVICE, NULL,
-+ US_FL_FIX_CAPACITY ),
-+
- UNUSUAL_DEV( 0x0781, 0x0001, 0x0200, 0x0200,
- "Sandisk",
- "ImageMate SDDR-05a",
diff --git a/usb/usb-visor.c-id-for-gspda-smartphone.patch b/usb/usb-visor.c-id-for-gspda-smartphone.patch
deleted file mode 100644
index 6ead241839358..0000000000000
--- a/usb/usb-visor.c-id-for-gspda-smartphone.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From hendrik@somehost.de Sun Feb 19 10:00:11 2006
-From: Hendrik Schweppe <hendrik@somehost.de>
-To: Greg KH <greg@kroah.com>
-Date: Sun, 19 Feb 2006 19:00:04 +0100
-Subject: USB: visor.c id for gspda smartphone
-Message-Id: <1140372004.24874.39.camel@localhost.localdomain>
-
-Added the USB vendorID of GSPDA and the productID of GSPDA's palm
-smartphone 'xplore m68' to the list of known devices.
-
-Signed-off-by: Hendrik Schweppe <linuxkpatch@hendrik.fam-schweppe.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/visor.c | 3 +++
- drivers/usb/serial/visor.h | 3 +++
- 2 files changed, 6 insertions(+)
-
---- gregkh-2.6.orig/drivers/usb/serial/visor.h
-+++ gregkh-2.6/drivers/usb/serial/visor.h
-@@ -36,6 +36,9 @@
- #define PALM_ZIRE_ID 0x0070
- #define PALM_M100_ID 0x0080
-
-+#define GSPDA_VENDOR_ID 0x115e
-+#define GSPDA_XPLORE_M68_ID 0xf100
-+
- #define SONY_VENDOR_ID 0x054C
- #define SONY_CLIE_3_5_ID 0x0038
- #define SONY_CLIE_4_0_ID 0x0066
---- gregkh-2.6.orig/drivers/usb/serial/visor.c
-+++ gregkh-2.6/drivers/usb/serial/visor.c
-@@ -69,6 +69,8 @@ static struct usb_device_id id_table []
- .driver_info = (kernel_ulong_t)&palm_os_4_probe },
- { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO600_ID),
- .driver_info = (kernel_ulong_t)&palm_os_4_probe },
-+ { USB_DEVICE(GSPDA_VENDOR_ID, GSPDA_XPLORE_M68_ID),
-+ .driver_info = (kernel_ulong_t)&palm_os_4_probe },
- { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID),
- .driver_info = (kernel_ulong_t)&palm_os_4_probe },
- { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID),
-@@ -139,6 +141,7 @@ static struct usb_device_id id_table_com
- { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_VISOR_ID) },
- { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO_ID) },
- { USB_DEVICE(HANDSPRING_VENDOR_ID, HANDSPRING_TREO600_ID) },
-+ { USB_DEVICE(GSPDA_VENDOR_ID, GSPDA_XPLORE_M68_ID) },
- { USB_DEVICE(PALM_VENDOR_ID, PALM_M500_ID) },
- { USB_DEVICE(PALM_VENDOR_ID, PALM_M505_ID) },
- { USB_DEVICE(PALM_VENDOR_ID, PALM_M515_ID) },
diff --git a/usb/wisegroup-mp-8866-dual-usb-joypad.patch b/usb/wisegroup-mp-8866-dual-usb-joypad.patch
deleted file mode 100644
index e0312c2ce6673..0000000000000
--- a/usb/wisegroup-mp-8866-dual-usb-joypad.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From mactalla.obair@gmail.com Sat Feb 25 06:52:36 2006
-Message-ID: <ae67fd3f0602250652h195aaf12l887018f166f72d76@mail.gmail.com>
-Date: Sat, 25 Feb 2006 09:52:27 -0500
-From: "Andrew Fuller" <mactalla.obair@gmail.com>
-To: "Greg KH" <greg@kroah.com>
-Subject: USB: Wisegroup MP-8866 Dual USB Joypad
-Cc: "Dmitry Torokhov" <dmitry.torokhov@gmail.com>
-
-This patch is for the Dual USB Joypad [0925:8866] from Wisegroup. The
-HID_QUIRK_NOGET is necessary for it to respond to input, and the
-HID_QUIRK_MULTI_INPUT is necessary to have two js# nodes appear.
-
-Signed-off-by: Andrew Fuller <mactalla.obair@gmail.com>
-Cc: "Dmitry Torokhov" <dmitry.torokhov@gmail.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/input/hid-core.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- gregkh-2.6.orig/drivers/usb/input/hid-core.c
-+++ gregkh-2.6/drivers/usb/input/hid-core.c
-@@ -1407,6 +1407,7 @@ void hid_init_reports(struct hid_device
- #define USB_VENDOR_ID_WISEGROUP 0x0925
- #define USB_DEVICE_ID_1_PHIDGETSERVO_20 0x8101
- #define USB_DEVICE_ID_4_PHIDGETSERVO_20 0x8104
-+#define USB_DEVICE_ID_DUAL_USB_JOYPAD 0x8866
-
- #define USB_VENDOR_ID_CODEMERCS 0x07c0
- #define USB_DEVICE_ID_CODEMERCS_IOW40 0x1500
-@@ -1577,6 +1578,7 @@ static const struct hid_blacklist {
- { USB_VENDOR_ID_CHICONY, USB_DEVICE_ID_CHICONY_USBHUB_KB, 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 },
-
- { USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_POWERMOUSE, HID_QUIRK_2WHEEL_POWERMOUSE },
- { USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU, HID_QUIRK_2WHEEL_MOUSE_HACK_7 },