diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-03 13:42:37 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-03 13:42:37 -0700 |
| commit | 60b2256738043c970b6b7cb2544695d7d19612f8 (patch) | |
| tree | bc9c8ce003950cac6faf13c58a124de6c1507331 /usb | |
| parent | 7660a07f66e7aa75f40b62c9d00fdd7320b58d6e (diff) | |
| download | patches-60b2256738043c970b6b7cb2544695d7d19612f8.tar.gz | |
remove usb patches now upstream
Diffstat (limited to 'usb')
7 files changed, 0 insertions, 320 deletions
diff --git a/usb/usb-allow-initialization-of-broken-keyspan-serial-adapters.patch b/usb/usb-allow-initialization-of-broken-keyspan-serial-adapters.patch deleted file mode 100644 index 5fdc1eb1acb825..00000000000000 --- a/usb/usb-allow-initialization-of-broken-keyspan-serial-adapters.patch +++ /dev/null @@ -1,61 +0,0 @@ -From linux-usb-owner@vger.kernel.org Thu Mar 27 07:05:38 2008 -From: Clark Rawlins <clark.rawlins@escient.com> -Date: Thu, 27 Mar 2008 09:56:17 -0400 -Subject: USB: Allow initialization of broken keyspan serial adapters. -To: linux-usb@vger.kernel.org -Message-ID: <1206626177.6557.10.camel@venture.bit63.org> - - -Fixes the keyspan driver after the addition of additional -checking of driver requirements introduced in usb-serial.c -commit 063a2da8f01806906f7d7b1a1424b9afddebc443. The initialization -of the keyspan usb_serial_driver structs were not initializing the -num_interrupt_out field and the additional checking was rejecting -the end point so the driver wouldn't finish initializing. - -This commit initializes the fields to NUM_DONT_CARE. -It works for the keyspan USA-49WG and doesn't break the USA-19HS -which are the two keyspan devices I have to test with. - -Signed-off-by: Clark Rawlins <clark.rawlins@escient.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/keyspan.h | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/usb/serial/keyspan.h -+++ b/drivers/usb/serial/keyspan.h -@@ -637,6 +637,7 @@ static struct usb_serial_driver keyspan_ - .description = "Keyspan - (without firmware)", - .id_table = keyspan_pre_ids, - .num_interrupt_in = NUM_DONT_CARE, -+ .num_interrupt_out = NUM_DONT_CARE, - .num_bulk_in = NUM_DONT_CARE, - .num_bulk_out = NUM_DONT_CARE, - .num_ports = 1, -@@ -651,6 +652,7 @@ static struct usb_serial_driver keyspan_ - .description = "Keyspan 1 port adapter", - .id_table = keyspan_1port_ids, - .num_interrupt_in = NUM_DONT_CARE, -+ .num_interrupt_out = NUM_DONT_CARE, - .num_bulk_in = NUM_DONT_CARE, - .num_bulk_out = NUM_DONT_CARE, - .num_ports = 1, -@@ -678,6 +680,7 @@ static struct usb_serial_driver keyspan_ - .description = "Keyspan 2 port adapter", - .id_table = keyspan_2port_ids, - .num_interrupt_in = NUM_DONT_CARE, -+ .num_interrupt_out = NUM_DONT_CARE, - .num_bulk_in = NUM_DONT_CARE, - .num_bulk_out = NUM_DONT_CARE, - .num_ports = 2, -@@ -705,6 +708,7 @@ static struct usb_serial_driver keyspan_ - .description = "Keyspan 4 port adapter", - .id_table = keyspan_4port_ids, - .num_interrupt_in = NUM_DONT_CARE, -+ .num_interrupt_out = NUM_DONT_CARE, - .num_bulk_in = NUM_DONT_CARE, - .num_bulk_out = NUM_DONT_CARE, - .num_ports = 4, diff --git a/usb/usb-another-ehci_iaa_watchdog-fix.patch b/usb/usb-another-ehci_iaa_watchdog-fix.patch deleted file mode 100644 index 5a79b692754fda..00000000000000 --- a/usb/usb-another-ehci_iaa_watchdog-fix.patch +++ /dev/null @@ -1,48 +0,0 @@ -From david-b@pacbell.net Wed Apr 2 13:49:39 2008 -From: David Brownell <david-b@pacbell.net> -Date: Wed, 2 Apr 2008 13:40:20 -0700 -Subject: USB: another ehci_iaa_watchdog fix -To: Greg KH <greg@kroah.com> -Cc: Andrew Morton <akpm@linux-foundation.org>, linux-usb@vger.kernel.org, lkml <linux-kernel@vger.kernel.org>, Mark Lord <lkml@rtr.ca> -Message-ID: <200804021340.21348.david-b@pacbell.net> -Content-Disposition: inline - - -This patch, suggested by Alan Stern, fixes the hung USB issues -on my notebook from suspend/resume cycles. - -It does so by eliminating some confusion about the internal state -machine associated with unlinking from the EHCI async schedule ring, -which caused a recent regression: - - http://bugzilla.kernel.org/show_bug.cgi?id=10345 - -Signed-off-by: Mark Lord <mlord@pobox.com> -Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-hub.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- a/drivers/usb/host/ehci-hub.c -+++ b/drivers/usb/host/ehci-hub.c -@@ -135,8 +135,6 @@ static int ehci_bus_suspend (struct usb_ - hcd->state = HC_STATE_QUIESCING; - } - ehci->command = ehci_readl(ehci, &ehci->regs->command); -- if (ehci->reclaim) -- end_unlink_async(ehci); - ehci_work(ehci); - - /* Unlike other USB host controller types, EHCI doesn't have -@@ -180,6 +178,9 @@ static int ehci_bus_suspend (struct usb_ - ehci_halt (ehci); - hcd->state = HC_STATE_SUSPENDED; - -+ if (ehci->reclaim) -+ end_unlink_async(ehci); -+ - /* allow remote wakeup */ - mask = INTR_MASK; - if (!device_may_wakeup(&hcd->self.root_hub->dev)) diff --git a/usb/usb-cp2101-add-identifiers-for-the-telegesys-etrx2usb.patch b/usb/usb-cp2101-add-identifiers-for-the-telegesys-etrx2usb.patch deleted file mode 100644 index 077bd7d8b1913e..00000000000000 --- a/usb/usb-cp2101-add-identifiers-for-the-telegesys-etrx2usb.patch +++ /dev/null @@ -1,33 +0,0 @@ -From florian.fainelli@telecomint.eu Tue Mar 25 11:31:45 2008 -From: Florian Fainelli <florian.fainelli@telecomint.eu> -Date: Tue, 25 Mar 2008 17:32:16 +0100 -Subject: USB: cp2101: Add identifiers for the Telegesys ETRX2USB -To: linux-usb@vger.kernel.org -Cc: gregkh@suse.de, craig@microtron.org.uk, Xavier Carcelle <xavier.carcelle@gmail.com> -Message-ID: <200803251732.18859.florian.fainelli@telecomint.eu> -Content-Disposition: inline - - -From: Florian Fainelli <florian.fainelli@telecomint.eu> - -This patch adds support for the Telegesys ETRX2USB which -works fine with the cp2101 driver. - -Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu> -Tested-by: Xavier Carcelle <xavier.carcelle@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/cp2101.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/serial/cp2101.c -+++ b/drivers/usb/serial/cp2101.c -@@ -75,6 +75,7 @@ static struct usb_device_id id_table [] - { USB_DEVICE(0x10C4, 0x81E2) }, /* Lipowsky Industrie Elektronik GmbH, Baby-LIN */ - { USB_DEVICE(0x10C4, 0x81E7) }, /* Aerocomm Radio */ - { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */ -+ { USB_DEVICE(0x10c4, 0x8293) }, /* Telegesys ETRX2USB */ - { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ - { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ - { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */ diff --git a/usb/usb-fix-bug-in-sg-initialization-in-usbtest.patch b/usb/usb-fix-bug-in-sg-initialization-in-usbtest.patch deleted file mode 100644 index e345ee84078d53..00000000000000 --- a/usb/usb-fix-bug-in-sg-initialization-in-usbtest.patch +++ /dev/null @@ -1,40 +0,0 @@ -From stern@rowland.harvard.edu Thu Mar 27 07:15:30 2008 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Thu, 27 Mar 2008 10:15:22 -0400 (EDT) -Subject: USB: fix bug in sg initialization in usbtest -To: Greg KH <greg@kroah.com> -Cc: Robert Jarzmik <rjarzmik@free.fr>, David Brownell <david-b@pacbell.net>, Jens Axboe <axboe@kernel.dk> -Message-ID: <Pine.LNX.4.44L0.0803271011440.3808-100000@iolanthe.rowland.org> - - -This patch (as1062) fixes a bug in the scatter-gather initialization -code in the usbtest driver. When the sg-helper conversion was -performed, it wasn't done correctly. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -CC: Jens Axboe <axboe@kernel.dk> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/misc/usbtest.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/usb/misc/usbtest.c -+++ b/drivers/usb/misc/usbtest.c -@@ -378,6 +378,7 @@ alloc_sglist (int nents, int max, int va - sg = kmalloc (nents * sizeof *sg, GFP_KERNEL); - if (!sg) - return NULL; -+ sg_init_table(sg, nents); - - for (i = 0; i < nents; i++) { - char *buf; -@@ -390,7 +391,7 @@ alloc_sglist (int nents, int max, int va - } - - /* kmalloc pages are always physically contiguous! */ -- sg_init_one(&sg[i], buf, size); -+ sg_set_buf(&sg[i], buf, size); - - switch (pattern) { - case 0: diff --git a/usb/usb-ohci-fix-2-timers-to-fire-at-jiffies-1s.patch b/usb/usb-ohci-fix-2-timers-to-fire-at-jiffies-1s.patch deleted file mode 100644 index 0b15e2d8f2aedc..00000000000000 --- a/usb/usb-ohci-fix-2-timers-to-fire-at-jiffies-1s.patch +++ /dev/null @@ -1,51 +0,0 @@ -From akpm@linux-foundation.org Fri Mar 28 14:51:42 2008 -From: Richard Kennedy <richard@rsk.demon.co.uk> -Date: Fri, 28 Mar 2008 14:50:30 -0700 -Subject: USB: ohci: fix 2 timers to fire at jiffies + 1s -To: greg@kroah.com -Cc: linux-usb@vger.kernel.org, akpm@linux-foundation.org, richard@rsk.demon.co.uk, arjan@infradead.org, david-b@pacbell.net, gregkh@suse.de, stern@rowland.harvard.edu -Message-ID: <200803282150.m2SLoUAi012343@imap1.linux-foundation.org> - - -From: Richard Kennedy <richard@rsk.demon.co.uk> - -Code inspection discovered in 2 places timers were being incorrectly setup -using round_jiffies_relative(HZ). The timer would then fire at time (0 <= T < -HZ). - -Fix them to use round_jiffies(jiffies + HZ); - -Signed-off-by: Richard Kennedy <richard@rsk.demon.co.uk> -Cc: Alan Stern <stern@rowland.harvard.edu> -Cc: David Brownell <david-b@pacbell.net> -Cc: Arjan van de Ven <arjan@infradead.org> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ohci-hcd.c | 2 +- - drivers/usb/host/ohci-q.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/usb/host/ohci-hcd.c -+++ b/drivers/usb/host/ohci-hcd.c -@@ -467,7 +467,7 @@ static void unlink_watchdog_func(unsigne - out: - kfree(seen); - if (ohci->eds_scheduled) -- mod_timer(&ohci->unlink_watchdog, round_jiffies_relative(HZ)); -+ mod_timer(&ohci->unlink_watchdog, round_jiffies(jiffies + HZ)); - done: - spin_unlock_irqrestore(&ohci->lock, flags); - } ---- a/drivers/usb/host/ohci-q.c -+++ b/drivers/usb/host/ohci-q.c -@@ -169,7 +169,7 @@ static int ed_schedule (struct ohci_hcd - if (quirk_zfmicro(ohci) - && (ed->type == PIPE_INTERRUPT) - && !(ohci->eds_scheduled++)) -- mod_timer(&ohci->unlink_watchdog, round_jiffies_relative(HZ)); -+ mod_timer(&ohci->unlink_watchdog, round_jiffies(jiffies + HZ)); - wmb (); - - /* we care about rm_list when setting CLE/BLE in case the HC was at diff --git a/usb/usb-serial-fix-regression-in-visor-palm-os-module-for-kernels-2.6.24.patch b/usb/usb-serial-fix-regression-in-visor-palm-os-module-for-kernels-2.6.24.patch deleted file mode 100644 index f30395319e388e..00000000000000 --- a/usb/usb-serial-fix-regression-in-visor-palm-os-module-for-kernels-2.6.24.patch +++ /dev/null @@ -1,43 +0,0 @@ -From brad@enigma.swatter.net Tue Mar 25 19:32:54 2008 -From: Brad Sawatzky <brad+kernel@swatter.net> -Date: Tue, 25 Mar 2008 22:32:43 -0400 -Subject: USB: serial: fix regression in Visor/Palm OS module for kernels >= 2.6.24 -To: Greg Kroah-Hartman <gregkh@suse.de> -Message-ID: <20080326023243.GA25564@enigma.swatter.net> -Content-Disposition: inline - - -Fixes a bug/inconsistency revealed by the additional sanity checking in - commit 063a2da8f01806906f7d7b1a1424b9afddebc443 -introduced in the original 2.6.24 branch. - -The Handspring Visor / PalmOS 4 device structure defines .num_bulk_out=2 -but the usb-serial probe returns num_bulk_out=3, triggering the check in -the above commit and forcing a bail out when the device (a Garmin iQue in -my case) attempts to connect. The patch bumps the expected number of -endpoints to 3. - -FWIW, this patch will probably solve the following kernel bug report for -Treo users (identical symptoms, different model PalmOS units): - <http://bugzilla.kernel.org/show_bug.cgi?id=10118> - - -Signed-off-by: Brad Sawatzky <brad+kernel@swatter.net> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/visor.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/serial/visor.c -+++ b/drivers/usb/serial/visor.c -@@ -191,7 +191,7 @@ static struct usb_serial_driver handspri - .id_table = id_table, - .num_interrupt_in = NUM_DONT_CARE, - .num_bulk_in = 2, -- .num_bulk_out = 2, -+ .num_bulk_out = NUM_DONT_CARE, - .num_ports = 2, - .open = visor_open, - .close = visor_close, diff --git a/usb/usb-serial-ti_usb_3410_5052-correct-tusb3410-endpoint-requirements.patch b/usb/usb-serial-ti_usb_3410_5052-correct-tusb3410-endpoint-requirements.patch deleted file mode 100644 index d733eaad134ffb..00000000000000 --- a/usb/usb-serial-ti_usb_3410_5052-correct-tusb3410-endpoint-requirements.patch +++ /dev/null @@ -1,44 +0,0 @@ -From rspanton@zepler.net Sun Mar 23 12:50:26 2008 -From: Robert Spanton <rspanton@zepler.net> -Date: Sun, 23 Mar 2008 19:47:23 +0000 -Subject: USB: serial: ti_usb_3410_5052: Correct TUSB3410 endpoint requirements. -To: gregkh@suse.de -Cc: linux-usb@vger.kernel.org -Message-ID: <47E6B3CB.4020701@zepler.net> - - -The changes introduced in commit -063a2da8f01806906f7d7b1a1424b9afddebc443 changed the semantics of the -num_interrupt_in, num_interrupt_out, num_bulk_in and num_bulk_out -entries of the usb_serial_driver struct to be the number of endpoints -the device has when probed. - -This patch changes the ti_1port_device usb_serial_driver struct to -reflect this change. The single port devices only have 1 -bulk_out endpoint in their initial configuration, and so this patch -changes the number of other types to NUM_DONT_CARE. - -The same change probably needs doing to the ti_2port_device struct, -but I don't have a two port device at hand. - -Signed-off-by: Robert Spanton <rspanton@zepler.net> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ti_usb_3410_5052.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/usb/serial/ti_usb_3410_5052.c -+++ b/drivers/usb/serial/ti_usb_3410_5052.c -@@ -265,8 +265,8 @@ static struct usb_serial_driver ti_1port - .description = "TI USB 3410 1 port adapter", - .usb_driver = &ti_usb_driver, - .id_table = ti_id_table_3410, -- .num_interrupt_in = 1, -- .num_bulk_in = 1, -+ .num_interrupt_in = NUM_DONT_CARE, -+ .num_bulk_in = NUM_DONT_CARE, - .num_bulk_out = 1, - .num_ports = 1, - .attach = ti_startup, |