diff options
36 files changed, 28 insertions, 1050 deletions
diff --git a/driver-core/bus_id-parisc.patch b/driver-core/bus_id-parisc.patch deleted file mode 100644 index fcf23ae0eae25f..00000000000000 --- a/driver-core/bus_id-parisc.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Kay Sievers <kay.sievers@vrfy.org> -Subject: parisc: struct device - replace bus_id with dev_name(), dev_set_name() - -Cc: kyle@mcmartin.ca -Cc: matthew@wil.cx -Cc: linux-parisc@vger.kernel.org -Reviewed-by: Grant Grundler <grundler@parisc-linux.org> -Acked-by: Greg Kroah-Hartman <gregkh@suse.de> -Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> ---- - drivers/parisc/dino.c | 11 ++++++----- - 1 file changed, 6 insertions(+), 5 deletions(-) - ---- a/drivers/parisc/dino.c -+++ b/drivers/parisc/dino.c -@@ -479,7 +479,7 @@ dino_card_setup(struct pci_bus *bus, voi - res = &dino_dev->hba.lmmio_space; - res->flags = IORESOURCE_MEM; - size = scnprintf(name, sizeof(name), "Dino LMMIO (%s)", -- bus->bridge->bus_id); -+ dev_name(bus->bridge)); - res->name = kmalloc(size+1, GFP_KERNEL); - if(res->name) - strcpy((char *)res->name, name); -@@ -493,7 +493,7 @@ dino_card_setup(struct pci_bus *bus, voi - struct list_head *ln, *tmp_ln; - - printk(KERN_ERR "Dino: cannot attach bus %s\n", -- bus->bridge->bus_id); -+ dev_name(bus->bridge)); - /* kill the bus, we can't do anything with it */ - list_for_each_safe(ln, tmp_ln, &bus->devices) { - struct pci_dev *dev = pci_dev_b(ln); -@@ -611,12 +611,12 @@ dino_fixup_bus(struct pci_bus *bus) - } - - DBG("DEBUG %s assigning %d [0x%lx,0x%lx]\n", -- bus->self->dev.bus_id, i, -+ dev_name(&bus->self->dev), i, - bus->self->resource[i].start, - bus->self->resource[i].end); - pci_assign_resource(bus->self, i); - DBG("DEBUG %s after assign %d [0x%lx,0x%lx]\n", -- bus->self->dev.bus_id, i, -+ dev_name(&bus->self->dev), i, - bus->self->resource[i].start, - bus->self->resource[i].end); - } -@@ -1026,7 +1026,8 @@ static int __init dino_probe(struct pari - dino_current_bus = bus->subordinate + 1; - pci_bus_assign_resources(bus); - } else { -- printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (probably duplicate bus number %d)\n", dev->dev.bus_id, dino_current_bus); -+ printk(KERN_ERR "ERROR: failed to scan PCI bus on %s (probably duplicate bus number %d)\n", -+ dev_name(&dev->dev), dino_current_bus); - /* increment the bus number in case of duplicates */ - dino_current_bus++; - } @@ -15,27 +15,6 @@ gregkh.pre/detect-atomic-counter-underflows.patch ################################# # USB patches for 2.6.29 ################################# -usb.current/usb-usbtmc-fix-stupid-bug-in-open.patch -usb.current/usb-usbtmc-add-protocol-1-support.patch -usb.current/usb-usbfs-keep-async-urbs-until-the-device-file-is-closed.patch -usb.current/usb-serial-add-ftdi-usb-serial-converter-devices.patch -usb.current/usb-serial-ftdi-enable-uart-detection-on-gnice-jtag-adaptors-blacklist-interface0.patch -usb.current/usb-serial-new-cp2101-device-id.patch -usb.current/usb-unusual_devs-add-support-for-gi-0431-sd-card-interface.patch -usb.current/usb-atm-cxacru-fix-lock-imbalance.patch -usb.current/usb-image-mdc800-fix-lock-imbalance.patch -usb.current/usb-misc-adutux-fix-lock-imbalance.patch -usb.current/usb-misc-vstusb-fix-lock-imbalance.patch -usb.current/usb-wusbcore-wa-xfer-fix-lock-imbalance.patch -usb.current/usb-option.c-add-zte-622-modem-device.patch -usb.current/usb-ehci-fix-isochronous-urb-leak.patch -usb.current/usb-ehci-expedite-unlinks-when-the-root-hub-is-suspended.patch -usb.current/usb-option-let-cdc-acm-handle-sony-ericsson-f3507g-dell-5530.patch -usb.current/usb-updated-unusual-devs-entry-for-usb-mass-storage-on-nokia-6233.patch -usb.current/usb-add-vendor-product-id-for-new-cdma-u727-to-option-driver.patch -usb.current/usb-add-device-id-for-option-gtm380-to-option-driver.patch -usb.current/usb-storage-unusual-usb-device-prolific-2507-variation-added.patch - usb.current/usb-add-quirk-to-avoid-config-and-interface-strings.patch ##################################################################### @@ -57,7 +36,6 @@ driver-core/bus_id-video2.patch driver-core/bus_id-zorro.patch driver-core/bus_id-mmc2.patch driver-core/bus_id-mtd.patch -driver-core/bus_id-parisc.patch driver-core/bus_id-pci.patch driver-core/bus_id-rapidio.patch driver-core/bus_id-s390.patch @@ -192,9 +170,9 @@ usb/usb-musb-partial-davinci-dm355-support.patch usb/usb-ch341-serial-fix-port-number-changed-after-resume.patch usb/usb-usbmon-add-binary-api-v1.patch usb/usb-twl-disable-vusb-regulators-when-cable-unplugged.patch -usb-uhci-don-t-use-pseudo-negative-values.patch -usb-make-transfer_buffer_lengths-in-struct-urb-field-u32.patch -usb-make-actual_length-in-struct-urb-field-u32.patch +usb/usb-uhci-don-t-use-pseudo-negative-values.patch +usb/usb-make-transfer_buffer_lengths-in-struct-urb-field-u32.patch +usb/usb-make-actual_length-in-struct-urb-field-u32.patch usb/usb-remove-phidget-drivers-from-kernel-tree.patch usb/usb-don-t-send-set-interface-after-reset.patch usb/usb-usbfs-remove-unneeded-inline-annotations.patch @@ -384,7 +362,6 @@ staging/staging-altpciechdma-null-deref-in-altpciechdma.c-remove.patch staging/staging-at76_usb-mention-mac80211-port-in-todo-file.patch staging/staging-at76_usb-convert-to-use-linux-ieee80211.h.patch staging/staging-rspiusb-use-usb-api-functions-rather-than-constants.patch -staging/staging-benet-convert-netif_rx_-to-napi_.patch staging/staging-usbip-kmem_cache_alloc-memset-kmem_cache_zalloc.patch staging/staging-et131x-list-usage-cleanup.patch staging/staging-altera-fix-printk-format-warnings.patch diff --git a/staging/staging-add-aten2011-usb-to-serial-converter-driver.patch b/staging/staging-add-aten2011-usb-to-serial-converter-driver.patch index df25e94982c673..f0f02f235ac3bc 100644 --- a/staging/staging-add-aten2011-usb-to-serial-converter-driver.patch +++ b/staging/staging-add-aten2011-usb-to-serial-converter-driver.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -101,5 +101,7 @@ source "drivers/staging/pohmelfs/Kconfig +@@ -99,5 +99,7 @@ source "drivers/staging/pohmelfs/Kconfig source "drivers/staging/stlc45xx/Kconfig" @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -33,3 +33,4 @@ obj-$(CONFIG_ANDROID) += android/ +@@ -32,3 +32,4 @@ obj-$(CONFIG_ANDROID) += android/ obj-$(CONFIG_DST) += dst/ obj-$(CONFIG_POHMELFS) += pohmelfs/ obj-$(CONFIG_STLC45XX) += stlc45xx/ diff --git a/staging/staging-add-heci-driver.patch b/staging/staging-add-heci-driver.patch index f0436f0a783d63..6a994ae63ab788 100644 --- a/staging/staging-add-heci-driver.patch +++ b/staging/staging-add-heci-driver.patch @@ -6714,7 +6714,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -109,5 +109,7 @@ source "drivers/staging/phison/Kconfig" +@@ -107,5 +107,7 @@ source "drivers/staging/phison/Kconfig" source "drivers/staging/p9auth/Kconfig" @@ -6724,7 +6724,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -37,3 +37,4 @@ obj-$(CONFIG_USB_SERIAL_ATEN2011) += uc2 +@@ -36,3 +36,4 @@ obj-$(CONFIG_USB_SERIAL_ATEN2011) += uc2 obj-$(CONFIG_B3DFG) += b3dfg/ obj-$(CONFIG_IDE_PHISON) += phison/ obj-$(CONFIG_PLAN9AUTH) += p9auth/ diff --git a/staging/staging-add-intel-poulsbo-morrestown-drm-driver.patch b/staging/staging-add-intel-poulsbo-morrestown-drm-driver.patch index 0196fa685f3045..7e076db5caea84 100644 --- a/staging/staging-add-intel-poulsbo-morrestown-drm-driver.patch +++ b/staging/staging-add-intel-poulsbo-morrestown-drm-driver.patch @@ -84,7 +84,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -115,5 +115,7 @@ source "drivers/staging/heci/Kconfig" +@@ -113,5 +113,7 @@ source "drivers/staging/heci/Kconfig" source "drivers/staging/line6/Kconfig" @@ -94,7 +94,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -40,3 +40,5 @@ obj-$(CONFIG_IDE_PHISON) += phison/ +@@ -39,3 +39,5 @@ obj-$(CONFIG_IDE_PHISON) += phison/ obj-$(CONFIG_PLAN9AUTH) += p9auth/ obj-$(CONFIG_HECI) += heci/ obj-$(CONFIG_LINE6_USB) += line6/ diff --git a/staging/staging-add-rt3070-wireless-driver.patch b/staging/staging-add-rt3070-wireless-driver.patch index 4fe5abb99f432f..1706eceaa0ecc6 100644 --- a/staging/staging-add-rt3070-wireless-driver.patch +++ b/staging/staging-add-rt3070-wireless-driver.patch @@ -99,9 +99,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +source "drivers/staging/rt3070/Kconfig" + - source "drivers/staging/benet/Kconfig" - source "drivers/staging/comedi/Kconfig" + + source "drivers/staging/asus_oled/Kconfig" --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile @@ -19,6 +19,7 @@ obj-$(CONFIG_AGNX) += agnx/ @@ -109,9 +109,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> obj-$(CONFIG_RT2860) += rt2860/ obj-$(CONFIG_RT2870) += rt2870/ +obj-$(CONFIG_RT3070) += rt3070/ - obj-$(CONFIG_BENET) += benet/ obj-$(CONFIG_COMEDI) += comedi/ obj-$(CONFIG_ASUS_OLED) += asus_oled/ + obj-$(CONFIG_PANEL) += panel/ --- /dev/null +++ b/drivers/staging/rt3070/2870_main_dev.c @@ -0,0 +1,1627 @@ diff --git a/staging/staging-add-stlc45xx-wi-fi-driver-for-stlc4550-4560.patch b/staging/staging-add-stlc45xx-wi-fi-driver-for-stlc4550-4560.patch index 203d61c198bac8..80e2bae770838e 100644 --- a/staging/staging-add-stlc45xx-wi-fi-driver-for-stlc4550-4560.patch +++ b/staging/staging-add-stlc45xx-wi-fi-driver-for-stlc4550-4560.patch @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -99,5 +99,7 @@ source "drivers/staging/dst/Kconfig" +@@ -97,5 +97,7 @@ source "drivers/staging/dst/Kconfig" source "drivers/staging/pohmelfs/Kconfig" @@ -43,7 +43,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -32,3 +32,4 @@ obj-$(CONFIG_EPL) += epl/ +@@ -31,3 +31,4 @@ obj-$(CONFIG_EPL) += epl/ obj-$(CONFIG_ANDROID) += android/ obj-$(CONFIG_DST) += dst/ obj-$(CONFIG_POHMELFS) += pohmelfs/ diff --git a/staging/staging-b3dfg-prepare-b3dfg-for-submission-upstream.patch b/staging/staging-b3dfg-prepare-b3dfg-for-submission-upstream.patch index c1aa23fd5a8aad..827cfd64813ec7 100644 --- a/staging/staging-b3dfg-prepare-b3dfg-for-submission-upstream.patch +++ b/staging/staging-b3dfg-prepare-b3dfg-for-submission-upstream.patch @@ -260,7 +260,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + - review endianness --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -103,5 +103,7 @@ source "drivers/staging/stlc45xx/Kconfig +@@ -101,5 +101,7 @@ source "drivers/staging/stlc45xx/Kconfig source "drivers/staging/uc2322/Kconfig" @@ -270,7 +270,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -34,3 +34,4 @@ obj-$(CONFIG_DST) += dst/ +@@ -33,3 +33,4 @@ obj-$(CONFIG_DST) += dst/ obj-$(CONFIG_POHMELFS) += pohmelfs/ obj-$(CONFIG_STLC45XX) += stlc45xx/ obj-$(CONFIG_USB_SERIAL_ATEN2011) += uc2322/ diff --git a/staging/staging-benet-convert-netif_rx_-to-napi_.patch b/staging/staging-benet-convert-netif_rx_-to-napi_.patch deleted file mode 100644 index c71d6492d89909..00000000000000 --- a/staging/staging-benet-convert-netif_rx_-to-napi_.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a.beregalov@gmail.com Wed Feb 4 14:56:37 2009 -From: Alexander Beregalov <a.beregalov@gmail.com> -Date: Wed, 4 Feb 2009 15:38:37 +0300 -Subject: Staging: benet: convert netif_rx_* to napi_* -To: Sathya Perla <sathyap@serverengines.com>, Greg Kroah-Hartman <gregkh@suse.de> -Message-ID: <20090204123837.GA12987@orion> -Content-Disposition: inline - - - *netif_rx_* functions were removed by 288379f ("net: Remove redundant NAPI - functions") - -Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/benet/be_int.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/staging/benet/be_int.c -+++ b/drivers/staging/benet/be_int.c -@@ -717,7 +717,7 @@ int be_poll(struct napi_struct *napi, in - - /* All consumed */ - if (work_done < budget) { -- netif_rx_complete(napi); -+ napi_complete(napi); - /* enable intr */ - be_notify_cmpl(pnob, work_done, pnob->rx_cq_id, 1); - } else { -@@ -752,7 +752,7 @@ static inline u32 process_events(struct - rid = AMAP_GET_BITS_PTR(EQ_ENTRY, ResourceID, eqp); - if (rid == pnob->rx_cq_id) { - adapter->be_stat.bes_rx_events++; -- netif_rx_schedule(&pnob->napi); -+ napi_schedule(&pnob->napi); - } else if (rid == pnob->tx_cq_id) { - process_nic_tx_completions(pnob); - } else if (rid == pnob->mcc_cq_id) { diff --git a/staging/staging-dst-kconfig-and-makefile-changes.patch b/staging/staging-dst-kconfig-and-makefile-changes.patch index eda940c369ce7e..270773358b5aa0 100644 --- a/staging/staging-dst-kconfig-and-makefile-changes.patch +++ b/staging/staging-dst-kconfig-and-makefile-changes.patch @@ -99,7 +99,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +nst-y := dcore.o state.o export.o thread_pool.o crypto.o trans.o --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -95,5 +95,7 @@ source "drivers/staging/epl/Kconfig" +@@ -93,5 +93,7 @@ source "drivers/staging/epl/Kconfig" source "drivers/staging/android/Kconfig" @@ -109,7 +109,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -30,3 +30,4 @@ obj-$(CONFIG_INPUT_MIMIO) += mimio/ +@@ -29,3 +29,4 @@ obj-$(CONFIG_INPUT_MIMIO) += mimio/ obj-$(CONFIG_TRANZPORT) += frontier/ obj-$(CONFIG_EPL) += epl/ obj-$(CONFIG_ANDROID) += android/ diff --git a/staging/staging-line6-add-to-the-build.patch b/staging/staging-line6-add-to-the-build.patch index e8a466f86c33c3..e06a8a81ad5d95 100644 --- a/staging/staging-line6-add-to-the-build.patch +++ b/staging/staging-line6-add-to-the-build.patch @@ -16,7 +16,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -113,5 +113,7 @@ source "drivers/staging/p9auth/Kconfig" +@@ -111,5 +111,7 @@ source "drivers/staging/p9auth/Kconfig" source "drivers/staging/heci/Kconfig" @@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -39,3 +39,4 @@ obj-$(CONFIG_B3DFG) += b3dfg/ +@@ -38,3 +38,4 @@ obj-$(CONFIG_B3DFG) += b3dfg/ obj-$(CONFIG_IDE_PHISON) += phison/ obj-$(CONFIG_PLAN9AUTH) += p9auth/ obj-$(CONFIG_HECI) += heci/ diff --git a/staging/staging-p9auth-add-to-the-kernel-build.patch b/staging/staging-p9auth-add-to-the-kernel-build.patch index 4315c1116cb31c..61bc1be709fc75 100644 --- a/staging/staging-p9auth-add-to-the-kernel-build.patch +++ b/staging/staging-p9auth-add-to-the-kernel-build.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -107,5 +107,7 @@ source "drivers/staging/b3dfg/Kconfig" +@@ -105,5 +105,7 @@ source "drivers/staging/b3dfg/Kconfig" source "drivers/staging/phison/Kconfig" @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -36,3 +36,4 @@ obj-$(CONFIG_STLC45XX) += stlc45xx/ +@@ -35,3 +35,4 @@ obj-$(CONFIG_STLC45XX) += stlc45xx/ obj-$(CONFIG_USB_SERIAL_ATEN2011) += uc2322/ obj-$(CONFIG_B3DFG) += b3dfg/ obj-$(CONFIG_IDE_PHISON) += phison/ diff --git a/staging/staging-phison-add-driver-to-the-build-system.patch b/staging/staging-phison-add-driver-to-the-build-system.patch index db66d4f60ff998..d5c631c6402a06 100644 --- a/staging/staging-phison-add-driver-to-the-build-system.patch +++ b/staging/staging-phison-add-driver-to-the-build-system.patch @@ -17,7 +17,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -105,5 +105,7 @@ source "drivers/staging/uc2322/Kconfig" +@@ -103,5 +103,7 @@ source "drivers/staging/uc2322/Kconfig" source "drivers/staging/b3dfg/Kconfig" @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -35,3 +35,4 @@ obj-$(CONFIG_POHMELFS) += pohmelfs/ +@@ -34,3 +34,4 @@ obj-$(CONFIG_POHMELFS) += pohmelfs/ obj-$(CONFIG_STLC45XX) += stlc45xx/ obj-$(CONFIG_USB_SERIAL_ATEN2011) += uc2322/ obj-$(CONFIG_B3DFG) += b3dfg/ diff --git a/staging/staging-pohmelfs-kconfig-makefile-and-vfs-changes.patch b/staging/staging-pohmelfs-kconfig-makefile-and-vfs-changes.patch index bceeb4155241ed..f3ae3a6ac11693 100644 --- a/staging/staging-pohmelfs-kconfig-makefile-and-vfs-changes.patch +++ b/staging/staging-pohmelfs-kconfig-makefile-and-vfs-changes.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/Kconfig +++ b/drivers/staging/Kconfig -@@ -97,5 +97,7 @@ source "drivers/staging/android/Kconfig" +@@ -95,5 +95,7 @@ source "drivers/staging/android/Kconfig" source "drivers/staging/dst/Kconfig" @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> endif # STAGING --- a/drivers/staging/Makefile +++ b/drivers/staging/Makefile -@@ -31,3 +31,4 @@ obj-$(CONFIG_TRANZPORT) += frontier/ +@@ -30,3 +30,4 @@ obj-$(CONFIG_TRANZPORT) += frontier/ obj-$(CONFIG_EPL) += epl/ obj-$(CONFIG_ANDROID) += android/ obj-$(CONFIG_DST) += dst/ diff --git a/usb.current/usb-add-device-id-for-option-gtm380-to-option-driver.patch b/usb.current/usb-add-device-id-for-option-gtm380-to-option-driver.patch deleted file mode 100644 index f78003a3bf2d18..00000000000000 --- a/usb.current/usb-add-device-id-for-option-gtm380-to-option-driver.patch +++ /dev/null @@ -1,36 +0,0 @@ -From akots@exponent.gr Mon Mar 16 20:31:38 2009 -From: Achilleas Kotsis <akots@exponent.gr> -Date: Mon, 16 Mar 2009 16:35:02 +0200 -Subject: USB: Add device id for Option GTM380 to option driver -Cc: Achilleas Kotsis <akots@exponent.gr> -Message-ID: <1237214102-10294-1-git-send-email-akots@exponent.gr> - - -Option GTM380 in Modem mode uses Product ID 0x7201. This has been tested and works -on production systems for over 6 months. - -Signed-off-by: Achilleas Kotsis <akots@exponent.gr> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/option.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/usb/serial/option.c -+++ b/drivers/usb/serial/option.c -@@ -89,6 +89,7 @@ static int option_send_setup(struct tty - #define OPTION_PRODUCT_ETNA_MODEM_GT 0x7041 - #define OPTION_PRODUCT_ETNA_MODEM_EX 0x7061 - #define OPTION_PRODUCT_ETNA_KOI_MODEM 0x7100 -+#define OPTION_PRODUCT_GTM380_MODEM 0x7201 - - #define HUAWEI_VENDOR_ID 0x12D1 - #define HUAWEI_PRODUCT_E600 0x1001 -@@ -322,6 +323,7 @@ static struct usb_device_id option_ids[] - { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_GT) }, - { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_EX) }, - { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_MODEM) }, -+ { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_GTM380_MODEM) }, - { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_Q101) }, - { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_Q111) }, - { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) }, diff --git a/usb.current/usb-add-vendor-product-id-for-new-cdma-u727-to-option-driver.patch b/usb.current/usb-add-vendor-product-id-for-new-cdma-u727-to-option-driver.patch deleted file mode 100644 index c4e6ccc515cdf5..00000000000000 --- a/usb.current/usb-add-vendor-product-id-for-new-cdma-u727-to-option-driver.patch +++ /dev/null @@ -1,39 +0,0 @@ -From hohndel@infradead.org Mon Mar 16 20:31:13 2009 -From: Dirk Hohndel <hohndel@infradead.org> -Date: Sat, 14 Mar 2009 20:47:39 -0700 -Subject: USB: Add Vendor/Product ID for new CDMA U727 to option driver -To: Matthias Urlichs <smurf@smurf.noris.de> -Cc: Greg Kroah-Hartman <gregkh@suse.de> -Message-ID: <20090314204739.51e8bf20@infradead.org> - - - - * newer versions of the Novatel Wireless U727 CDMA 3G USB stick - have a different Product ID (0x5010); adding this ID makes them - work just fine with the option driver - -Signed-off-by: Dirk Hohndel <hohndel@infradead.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/option.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/usb/serial/option.c -+++ b/drivers/usb/serial/option.c -@@ -197,6 +197,7 @@ static int option_send_setup(struct tty - /* OVATION PRODUCTS */ - #define NOVATELWIRELESS_PRODUCT_MC727 0x4100 - #define NOVATELWIRELESS_PRODUCT_MC950D 0x4400 -+#define NOVATELWIRELESS_PRODUCT_U727 0x5010 - - /* FUTURE NOVATEL PRODUCTS */ - #define NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED 0X6000 -@@ -411,6 +412,7 @@ static struct usb_device_id option_ids[] - { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */ - { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */ - { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */ -+ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U727) }, /* Novatel MC727/U727/USB727 */ - { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_FULLSPEED) }, /* Novatel EVDO product */ - { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_FULLSPEED) }, /* Novatel HSPA product */ - { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) }, /* Novatel EVDO Embedded product */ diff --git a/usb.current/usb-atm-cxacru-fix-lock-imbalance.patch b/usb.current/usb-atm-cxacru-fix-lock-imbalance.patch deleted file mode 100644 index 0fec4a15217854..00000000000000 --- a/usb.current/usb-atm-cxacru-fix-lock-imbalance.patch +++ /dev/null @@ -1,39 +0,0 @@ -From jirislaby@gmail.com Wed Mar 11 14:00:49 2009 -From: Jiri Slaby <jirislaby@gmail.com> -Date: Wed, 11 Mar 2009 21:47:36 +0100 -Subject: USB: atm/cxacru, fix lock imbalance -To: gregkh@suse.de -Cc: Jiri Slaby <jirislaby@gmail.com>, Simon Arlott <cxacru@fire.lp0.eu> -Message-ID: <1236804460-1432-1-git-send-email-jirislaby@gmail.com> - - -We do not hold mutex in one place in cxacru_cm, but unlock it on fail path. -Fix this. - -Signed-off-by: Jiri Slaby <jirislaby@gmail.com> -Cc: Simon Arlott <cxacru@fire.lp0.eu> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/atm/cxacru.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/usb/atm/cxacru.c -+++ b/drivers/usb/atm/cxacru.c -@@ -485,7 +485,7 @@ static int cxacru_cm(struct cxacru_data - usb_err(instance->usbatm, "requested transfer size too large (%d, %d)\n", - wbuflen, rbuflen); - ret = -ENOMEM; -- goto fail; -+ goto err; - } - - mutex_lock(&instance->cm_serialize); -@@ -565,6 +565,7 @@ static int cxacru_cm(struct cxacru_data - dbg("cm %#x", cm); - fail: - mutex_unlock(&instance->cm_serialize); -+err: - return ret; - } - diff --git a/usb.current/usb-ehci-expedite-unlinks-when-the-root-hub-is-suspended.patch b/usb.current/usb-ehci-expedite-unlinks-when-the-root-hub-is-suspended.patch deleted file mode 100644 index ed9afbb19c84a2..00000000000000 --- a/usb.current/usb-ehci-expedite-unlinks-when-the-root-hub-is-suspended.patch +++ /dev/null @@ -1,43 +0,0 @@ -From stern@rowland.harvard.edu Mon Mar 16 20:25:10 2009 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Mon, 16 Mar 2009 14:21:56 -0400 (EDT) -Subject: USB: EHCI: expedite unlinks when the root hub is suspended -To: Greg KH <greg@kroah.com> -Cc: Brandon Philips <brandon@ifup.org>, David Brownell <david-b@pacbell.net> -Message-ID: <Pine.LNX.4.44L0.0903161420360.4169-100000@iolanthe.rowland.org> - - -This patch (as1225) fixes a bug in ehci-hcd. The condition for -whether unlinked QHs can become IDLE should not be that the controller -is halted, but rather that the controller isn't running. In other -words when the root hub is suspended, the hardware doesn't own any -QHs. - -This fixes a problem that can show up during hibernation: If a QH is -only partially unlinked when the root hub is frozen, then when the -root hub is thawed the QH won't be in the IDLE state. As a result it -can't be used properly for new URB submissions. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Reported-by: Brandon Philips <brandon@ifup.org> -Tested-by: Brandon Philips <brandon@ifup.org> -Acked-by: David Brownell <dbrownell@users.sourceforge.net> -Cc: Stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-q.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/usb/host/ehci-q.c -+++ b/drivers/usb/host/ehci-q.c -@@ -1095,7 +1095,8 @@ static void start_unlink_async (struct e - prev->qh_next = qh->qh_next; - wmb (); - -- if (unlikely (ehci_to_hcd(ehci)->state == HC_STATE_HALT)) { -+ /* If the controller isn't running, we don't have to wait for it */ -+ if (unlikely(!HC_IS_RUNNING(ehci_to_hcd(ehci)->state))) { - /* if (unlikely (qh->reclaim != 0)) - * this will recurse, probably not much - */ diff --git a/usb.current/usb-ehci-fix-isochronous-urb-leak.patch b/usb.current/usb-ehci-fix-isochronous-urb-leak.patch deleted file mode 100644 index a782e7dd616ed7..00000000000000 --- a/usb.current/usb-ehci-fix-isochronous-urb-leak.patch +++ /dev/null @@ -1,80 +0,0 @@ -From fzuuzf@googlemail.com Wed Mar 11 15:58:36 2009 -From: Karsten Wiese <fzuuzf@googlemail.com> -Date: Thu, 26 Feb 2009 01:47:48 +0100 -Subject: USB: EHCI: Fix isochronous URB leak -To: Greg KH <greg@kroah.com>, David Brownell <david-b@pacbell.net> -Cc: Greg KH <gregkh@suse.de> -Message-ID: <200902260147.48434.fzuuzf@googlemail.com> - - -ehci-hcd uses usb_get_urb() and usb_put_urb() in an unbalanced way causing -isochronous URB's kref.counts incrementing once per usb_submit_urb() call. -The culprit is *usb being set to NULL when usb_put_urb() is called after URB -is given back. -Due to other fixes there is no need for ehci-hcd to deal with usb_get_urb() -nor usb_put_urb() anymore, so patch removes their usages in ehci-hcd. -Patch also makes ehci_to_hcd(ehci)->self.bandwidth_allocated adjust, if a -stream finishes. - -Signed-off-by: Karsten Wiese <fzu@wemgehoertderstaat.de> -Cc: David Brownell <david-b@pacbell.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-sched.c | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - ---- a/drivers/usb/host/ehci-sched.c -+++ b/drivers/usb/host/ehci-sched.c -@@ -1536,7 +1536,7 @@ itd_link_urb ( - struct ehci_itd, itd_list); - list_move_tail (&itd->itd_list, &stream->td_list); - itd->stream = iso_stream_get (stream); -- itd->urb = usb_get_urb (urb); -+ itd->urb = urb; - itd_init (ehci, stream, itd); - } - -@@ -1645,7 +1645,7 @@ itd_complete ( - (void) disable_periodic(ehci); - ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--; - -- if (unlikely (list_empty (&stream->td_list))) { -+ if (unlikely(list_is_singular(&stream->td_list))) { - ehci_to_hcd(ehci)->self.bandwidth_allocated - -= stream->bandwidth; - ehci_vdbg (ehci, -@@ -1656,7 +1656,6 @@ itd_complete ( - iso_stream_put (ehci, stream); - - done: -- usb_put_urb(urb); - itd->urb = NULL; - if (ehci->clock_frame != itd->frame || itd->index[7] != -1) { - /* OK to recycle this ITD now. */ -@@ -1949,7 +1948,7 @@ sitd_link_urb ( - struct ehci_sitd, sitd_list); - list_move_tail (&sitd->sitd_list, &stream->td_list); - sitd->stream = iso_stream_get (stream); -- sitd->urb = usb_get_urb (urb); -+ sitd->urb = urb; - - sitd_patch(ehci, stream, sitd, sched, packet); - sitd_link (ehci, (next_uframe >> 3) % ehci->periodic_size, -@@ -2034,7 +2033,7 @@ sitd_complete ( - (void) disable_periodic(ehci); - ehci_to_hcd(ehci)->self.bandwidth_isoc_reqs--; - -- if (list_empty (&stream->td_list)) { -+ if (list_is_singular(&stream->td_list)) { - ehci_to_hcd(ehci)->self.bandwidth_allocated - -= stream->bandwidth; - ehci_vdbg (ehci, -@@ -2045,7 +2044,6 @@ sitd_complete ( - iso_stream_put (ehci, stream); - /* OK to recycle this SITD now that its completion callback ran. */ - done: -- usb_put_urb(urb); - sitd->urb = NULL; - sitd->stream = NULL; - list_move(&sitd->sitd_list, &stream->free_list); diff --git a/usb.current/usb-image-mdc800-fix-lock-imbalance.patch b/usb.current/usb-image-mdc800-fix-lock-imbalance.patch deleted file mode 100644 index 91aeaedb08a414..00000000000000 --- a/usb.current/usb-image-mdc800-fix-lock-imbalance.patch +++ /dev/null @@ -1,29 +0,0 @@ -From jirislaby@gmail.com Wed Mar 11 14:01:10 2009 -From: Jiri Slaby <jirislaby@gmail.com> -Date: Wed, 11 Mar 2009 21:47:37 +0100 -Subject: USB: image/mdc800, fix lock imbalance -To: gregkh@suse.de -Cc: Jiri Slaby <jirislaby@gmail.com>, Henning Zabel <henning@uni-paderborn.de> -Message-ID: <1236804460-1432-2-git-send-email-jirislaby@gmail.com> - - -There is an omitted unlock in mdc800_usb_probe's fail path. Add it. - -Signed-off-by: Jiri Slaby <jirislaby@gmail.com> -Cc: Henning Zabel <henning@uni-paderborn.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/image/mdc800.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/image/mdc800.c -+++ b/drivers/usb/image/mdc800.c -@@ -499,6 +499,7 @@ static int mdc800_usb_probe (struct usb_ - retval = usb_register_dev(intf, &mdc800_class); - if (retval) { - dev_err(&intf->dev, "Not able to get a minor for this device.\n"); -+ mutex_unlock(&mdc800->io_lock); - return -ENODEV; - } - diff --git a/usb.current/usb-misc-adutux-fix-lock-imbalance.patch b/usb.current/usb-misc-adutux-fix-lock-imbalance.patch deleted file mode 100644 index 8f1bdc71ef4a74..00000000000000 --- a/usb.current/usb-misc-adutux-fix-lock-imbalance.patch +++ /dev/null @@ -1,41 +0,0 @@ -From jirislaby@gmail.com Wed Mar 11 14:01:28 2009 -From: Jiri Slaby <jirislaby@gmail.com> -Date: Wed, 11 Mar 2009 21:47:38 +0100 -Subject: USB: misc/adutux, fix lock imbalance -To: gregkh@suse.de -Cc: Jiri Slaby <jirislaby@gmail.com> -Message-ID: <1236804460-1432-3-git-send-email-jirislaby@gmail.com> - - -Don't unlock adutux_mutex when not held. - -Signed-off-by: Jiri Slaby <jirislaby@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/misc/adutux.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - ---- a/drivers/usb/misc/adutux.c -+++ b/drivers/usb/misc/adutux.c -@@ -376,7 +376,7 @@ static int adu_release(struct inode *ino - if (dev->open_count <= 0) { - dbg(1," %s : device not opened", __func__); - retval = -ENODEV; -- goto exit; -+ goto unlock; - } - - adu_release_internal(dev); -@@ -385,9 +385,9 @@ static int adu_release(struct inode *ino - if (!dev->open_count) /* ... and we're the last user */ - adu_delete(dev); - } -- --exit: -+unlock: - mutex_unlock(&adutux_mutex); -+exit: - dbg(2," %s : leave, return value %d", __func__, retval); - return retval; - } diff --git a/usb.current/usb-misc-vstusb-fix-lock-imbalance.patch b/usb.current/usb-misc-vstusb-fix-lock-imbalance.patch deleted file mode 100644 index a6dc8dac509ba6..00000000000000 --- a/usb.current/usb-misc-vstusb-fix-lock-imbalance.patch +++ /dev/null @@ -1,29 +0,0 @@ -From jirislaby@gmail.com Wed Mar 11 14:01:52 2009 -From: Jiri Slaby <jirislaby@gmail.com> -Date: Wed, 11 Mar 2009 21:47:39 +0100 -Subject: USB: misc/vstusb, fix lock imbalance -To: gregkh@suse.de -Cc: Jiri Slaby <jirislaby@gmail.com> -Message-ID: <1236804460-1432-4-git-send-email-jirislaby@gmail.com> - - -Make sure we don't leak locked vstdev->lock in vstusb_write. Unlock -properly on one fail path. - -Signed-off-by: Jiri Slaby <jirislaby@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/misc/vstusb.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/misc/vstusb.c -+++ b/drivers/usb/misc/vstusb.c -@@ -401,6 +401,7 @@ static ssize_t vstusb_write(struct file - } - - if (copy_from_user(buf, buffer, count)) { -+ mutex_unlock(&vstdev->lock); - dev_err(&dev->dev, "%s: can't copy_from_user\n", __func__); - retval = -EFAULT; - goto exit; diff --git a/usb.current/usb-option-let-cdc-acm-handle-sony-ericsson-f3507g-dell-5530.patch b/usb.current/usb-option-let-cdc-acm-handle-sony-ericsson-f3507g-dell-5530.patch deleted file mode 100644 index 0ced7e5e72717e..00000000000000 --- a/usb.current/usb-option-let-cdc-acm-handle-sony-ericsson-f3507g-dell-5530.patch +++ /dev/null @@ -1,53 +0,0 @@ -From dcbw@redhat.com Mon Mar 16 20:29:36 2009 -From: Dan Williams <dcbw@redhat.com> -Date: Thu, 12 Mar 2009 06:53:00 -0400 -Subject: USB: Option: let cdc-acm handle Sony Ericsson F3507g / Dell 5530 -To: Greg KH <greg@kroah.com> -Cc: Matthias Urlichs <smurf@smurf.noris.de>, oliver@neukum.org, Bj�rn Mork <bjorn@mork.no> -Message-ID: <1236855180.14863.10.camel@localhost.localdomain> - - -The generic cdc-acm driver is now the best one to handle Sony Ericsson -F3507g-based devices (which the Dell 5530 is a rebrand of), now that all -the pieces are in place (ie, cac477e8f1038c41b6f29d3161ce351462ef3df7). -Removing the IDs from option allows cdc-acm to handle the device. - -Signed-off-by: Dan Williams <dcbw@redhat.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/usb/serial/option.c | 8 -------- - 1 file changed, 8 deletions(-) - ---- a/drivers/usb/serial/option.c -+++ b/drivers/usb/serial/option.c -@@ -293,11 +293,6 @@ static int option_send_setup(struct tty - #define ZTE_PRODUCT_MF626 0x0031 - #define ZTE_PRODUCT_CDMA_TECH 0xfffe - --/* Ericsson products */ --#define ERICSSON_VENDOR_ID 0x0bdb --#define ERICSSON_PRODUCT_F3507G_1 0x1900 --#define ERICSSON_PRODUCT_F3507G_2 0x1902 -- - #define BENQ_VENDOR_ID 0x04a5 - #define BENQ_PRODUCT_H10 0x4068 - -@@ -443,7 +438,6 @@ static struct usb_device_id option_ids[] - { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_CINGULAR) }, /* Dell Wireless HSDPA 5520 == Novatel Expedite EU860D */ - { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_L) }, /* Dell Wireless HSDPA 5520 */ - { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5520_MINICARD_GENERIC_I) }, /* Dell Wireless 5520 Voda I Mobile Broadband (3G HSDPA) Minicard */ -- { USB_DEVICE(DELL_VENDOR_ID, 0x8147) }, /* Dell Wireless 5530 Mobile Broadband (3G HSPA) Mini-Card */ - { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_SPRINT) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ - { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_TELUS) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ - { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5730_MINICARD_VZW) }, /* Dell Wireless 5730 Mobile Broadband EVDO/HSPA Mini-Card */ -@@ -515,8 +509,6 @@ static struct usb_device_id option_ids[] - { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626) }, - { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) }, - { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) }, -- { USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G_1) }, -- { USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G_2) }, - { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) }, - { USB_DEVICE(0x1da5, 0x4515) }, /* BenQ H20 */ - { } /* Terminating entry */ diff --git a/usb.current/usb-option.c-add-zte-622-modem-device.patch b/usb.current/usb-option.c-add-zte-622-modem-device.patch deleted file mode 100644 index 23911ed4703303..00000000000000 --- a/usb.current/usb-option.c-add-zte-622-modem-device.patch +++ /dev/null @@ -1,37 +0,0 @@ -From albert.pauw@gmail.com Wed Mar 11 13:28:39 2009 -From: Albert Pauw <albert.pauw@gmail.com> -Date: Sun, 01 Mar 2009 09:37:52 +0100 -Subject: USB: option.c: add ZTE 622 modem device -To: linux-usb@vger.kernel.org -Message-ID: <49AA4960.8010903@gmail.com> - - -Please consider this small patch for the usb option-card driver. -This patch adds the ZTE 622 usb modem device. - -Signed-off-by: Albert Pauw <albert.pauw@gmail.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/option.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/usb/serial/option.c -+++ b/drivers/usb/serial/option.c -@@ -288,6 +288,7 @@ static int option_send_setup(struct tty - - /* ZTE PRODUCTS */ - #define ZTE_VENDOR_ID 0x19d2 -+#define ZTE_PRODUCT_MF622 0x0001 - #define ZTE_PRODUCT_MF628 0x0015 - #define ZTE_PRODUCT_MF626 0x0031 - #define ZTE_PRODUCT_CDMA_TECH 0xfffe -@@ -510,6 +511,7 @@ static struct usb_device_id option_ids[] - { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */ - { USB_DEVICE(MAXON_VENDOR_ID, 0x6280) }, /* BP3-USB & BP3-EXT HSDPA */ - { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, -+ { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622) }, - { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF626) }, - { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) }, - { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) }, diff --git a/usb.current/usb-serial-add-ftdi-usb-serial-converter-devices.patch b/usb.current/usb-serial-add-ftdi-usb-serial-converter-devices.patch deleted file mode 100644 index 743e0eeb4b3687..00000000000000 --- a/usb.current/usb-serial-add-ftdi-usb-serial-converter-devices.patch +++ /dev/null @@ -1,65 +0,0 @@ -From akpm@linux-foundation.org Wed Mar 11 10:54:59 2009 -From: Axel Wachtler <axel.wachtler@atmel.com> -Date: Thu, 05 Mar 2009 14:09:22 -0800 -Subject: USB: serial: add FTDI USB/Serial converter devices -Cc: axel.wachtler@atmel.com, greg@kroah.com, robert.richter@amd.com -Message-ID: <200903052209.n25M9MRb006767@imap1.linux-foundation.org> - -From: Axel Wachtler <axel.wachtler@atmel.com> - -Add the following devices to the USB FTDI SIO device table: - - Bus 001 Device 009: ID 03eb:2109 Atmel Corp. - http://www.atmel.com/dyn/products/tools_card.asp?tool_id=4187 - - Bus 001 Device 008: ID 1cf1:0001 - http://www.dresden-elektronik.de/shop/prod75.html - - Bus 001 Device 007: ID 1c1f:0004 - http://www.dresden-elektronik.de/shop/prod64.html - -Signed-off-by: Axel Wachtler <axel.wachtler@atmel.com> -Signed-off-by: Robert Richter <robert.richter@amd.com> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ftdi_sio.c | 3 +++ - drivers/usb/serial/ftdi_sio.h | 13 +++++++++++++ - 2 files changed, 16 insertions(+) - ---- a/drivers/usb/serial/ftdi_sio.c -+++ b/drivers/usb/serial/ftdi_sio.c -@@ -663,6 +663,9 @@ static struct usb_device_id id_table_com - { USB_DEVICE(ALTI2_VID, ALTI2_N3_PID) }, - { USB_DEVICE(FTDI_VID, DIEBOLD_BCS_SE923_PID) }, - { USB_DEVICE(FTDI_VID, FTDI_NDI_HUC_PID) }, -+ { USB_DEVICE(ATMEL_VID, STK541_PID) }, -+ { USB_DEVICE(DE_VID, STB_PID) }, -+ { USB_DEVICE(DE_VID, WHT_PID) }, - { }, /* Optional parameter entry */ - { } /* Terminating entry */ - }; ---- a/drivers/usb/serial/ftdi_sio.h -+++ b/drivers/usb/serial/ftdi_sio.h -@@ -893,6 +893,19 @@ - #define DIEBOLD_BCS_SE923_PID 0xfb99 - - /* -+ * Atmel STK541 -+ */ -+#define ATMEL_VID 0x03eb /* Vendor ID */ -+#define STK541_PID 0x2109 /* Zigbee Controller */ -+ -+/* -+ * Dresden Elektronic Sensor Terminal Board -+ */ -+#define DE_VID 0x1cf1 /* Vendor ID */ -+#define STB_PID 0x0001 /* Sensor Terminal Board */ -+#define WHT_PID 0x0004 /* Wireless Handheld Terminal */ -+ -+/* - * BmRequestType: 1100 0000b - * bRequest: FTDI_E2_READ - * wValue: 0 diff --git a/usb.current/usb-serial-ftdi-enable-uart-detection-on-gnice-jtag-adaptors-blacklist-interface0.patch b/usb.current/usb-serial-ftdi-enable-uart-detection-on-gnice-jtag-adaptors-blacklist-interface0.patch deleted file mode 100644 index 8ffa89b50509bf..00000000000000 --- a/usb.current/usb-serial-ftdi-enable-uart-detection-on-gnice-jtag-adaptors-blacklist-interface0.patch +++ /dev/null @@ -1,47 +0,0 @@ -From akpm@linux-foundation.org Wed Mar 11 10:55:39 2009 -From: Michael Hennerich <michael.hennerich@analog.com> -Date: Fri, 06 Mar 2009 14:07:43 -0800 -Subject: USB: serial: ftdi: enable UART detection on gnICE JTAG adaptors blacklist interface0 -Cc: michael.hennerich@analog.com, cooloney@kernel.org, greg@kroah.com -Message-ID: <200903062207.n26M7h8B004323@imap1.linux-foundation.org> - -From: Michael Hennerich <michael.hennerich@analog.com> - -Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> -Signed-off-by: Bryan Wu <cooloney@kernel.org> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ftdi_sio.c | 2 ++ - drivers/usb/serial/ftdi_sio.h | 7 +++++++ - 2 files changed, 9 insertions(+) - ---- a/drivers/usb/serial/ftdi_sio.c -+++ b/drivers/usb/serial/ftdi_sio.c -@@ -666,6 +666,8 @@ static struct usb_device_id id_table_com - { USB_DEVICE(ATMEL_VID, STK541_PID) }, - { USB_DEVICE(DE_VID, STB_PID) }, - { USB_DEVICE(DE_VID, WHT_PID) }, -+ { USB_DEVICE(ADI_VID, ADI_GNICE_PID), -+ .driver_info = (kernel_ulong_t)&ftdi_jtag_quirk }, - { }, /* Optional parameter entry */ - { } /* Terminating entry */ - }; ---- a/drivers/usb/serial/ftdi_sio.h -+++ b/drivers/usb/serial/ftdi_sio.h -@@ -906,6 +906,13 @@ - #define WHT_PID 0x0004 /* Wireless Handheld Terminal */ - - /* -+ * Blackfin gnICE JTAG -+ * http://docs.blackfin.uclinux.org/doku.php?id=hw:jtag:gnice -+ */ -+#define ADI_VID 0x0456 -+#define ADI_GNICE_PID 0xF000 -+ -+/* - * BmRequestType: 1100 0000b - * bRequest: FTDI_E2_READ - * wValue: 0 diff --git a/usb.current/usb-serial-new-cp2101-device-id.patch b/usb.current/usb-serial-new-cp2101-device-id.patch deleted file mode 100644 index a8952c5965667a..00000000000000 --- a/usb.current/usb-serial-new-cp2101-device-id.patch +++ /dev/null @@ -1,29 +0,0 @@ -From rmk@unh.edu Wed Mar 11 10:57:43 2009 -From: "Robert M. Kenney" <rmk@unh.edu> -Date: Thu, 26 Feb 2009 14:58:39 -0500 -Subject: USB: serial: new cp2101 device id -To: Greg KH <greg@kroah.com> -Message-ID: <49A6F46F.5030302@unh.edu> - -From: "Robert M. Kenney" <rmk@unh.edu> - - - -From: Robert M. Kenney <rmk@unh.edu> -Cc: stable <stable@kernel.org> -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 -@@ -79,6 +79,7 @@ static struct usb_device_id id_table [] - { USB_DEVICE(0x10C4, 0x814A) }, /* West Mountain Radio RIGblaster P&P */ - { USB_DEVICE(0x10C4, 0x814B) }, /* West Mountain Radio RIGtalk */ - { USB_DEVICE(0x10C4, 0x815E) }, /* Helicomm IP-Link 1220-DVM */ -+ { USB_DEVICE(0x10C4, 0x819F) }, /* MJS USB Toslink Switcher */ - { USB_DEVICE(0x10C4, 0x81A6) }, /* ThinkOptics WavIt */ - { USB_DEVICE(0x10C4, 0x81AC) }, /* MSD Dash Hawk */ - { USB_DEVICE(0x10C4, 0x81C8) }, /* Lipowsky Industrie Elektronik GmbH, Baby-JTAG */ diff --git a/usb.current/usb-storage-unusual-usb-device-prolific-2507-variation-added.patch b/usb.current/usb-storage-unusual-usb-device-prolific-2507-variation-added.patch deleted file mode 100644 index 51276f2ec934d4..00000000000000 --- a/usb.current/usb-storage-unusual-usb-device-prolific-2507-variation-added.patch +++ /dev/null @@ -1,50 +0,0 @@ -From tbartdev@gmx-topmail.de Mon Mar 16 20:32:12 2009 -From: "Thomas Bartosik" <tbartdev@gmx-topmail.de> -Date: Mon, 16 Mar 2009 16:04:38 +0100 -Subject: USB: storage: Unusual USB device Prolific 2507 variation added -To: phil@ipom.com -Cc: linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net -Message-ID: <20090316150438.83070@gmx.net> - - -from: Thomas Bartosik <tbartdev@gmx-topmail.de> - -The "c-enter" USB to Toshiba 1.8" IDE enclosure needs special treatment -to work flawlessly. This patch is absolutely trivial, as the integrated -USB-IDE bridge is already identified to be an "unusual" device, only the -bcdDevice is different (lower) to the bcdDeviceMin already included in -the kernel. -It is a Prolific 2507 bridge. - -T: Bus=02 Lev=01 Prnt=01 Port=02 Cnt=01 Dev#= 4 Spd=480 MxCh= 0 -D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 -P: Vendor=067b ProdID=2507 Rev= 0.01 -S: Manufacturer=Prolific Technology Inc. -S: Product=ATAPI-6 Bridge Controller -S: SerialNumber=00000272 -C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr=100mA -I:* If#= 0 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage -E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms - - -Signed-off-by: Thomas Bartosik <tbartdev@gmx-topmail.de> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/storage/unusual_devs.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/usb/storage/unusual_devs.h -+++ b/drivers/usb/storage/unusual_devs.h -@@ -951,7 +951,9 @@ UNUSUAL_DEV( 0x066f, 0x8000, 0x0001, 0x0 - US_FL_FIX_CAPACITY ), - - /* Reported by Richard -=[]=- <micro_flyer@hotmail.com> */ --UNUSUAL_DEV( 0x067b, 0x2507, 0x0100, 0x0100, -+/* Change to bcdDeviceMin (0x0100 to 0x0001) reported by -+ * Thomas Bartosik <tbartdev@gmx-topmail.de> */ -+UNUSUAL_DEV( 0x067b, 0x2507, 0x0001, 0x0100, - "Prolific Technology Inc.", - "Mass Storage Device", - US_SC_DEVICE, US_PR_DEVICE, NULL, diff --git a/usb.current/usb-unusual_devs-add-support-for-gi-0431-sd-card-interface.patch b/usb.current/usb-unusual_devs-add-support-for-gi-0431-sd-card-interface.patch deleted file mode 100644 index 5b0ac59bc7aa26..00000000000000 --- a/usb.current/usb-unusual_devs-add-support-for-gi-0431-sd-card-interface.patch +++ /dev/null @@ -1,85 +0,0 @@ -From J.Dumon@option.com Tue Mar 10 21:05:25 2009 -From: Jan Dumon <j.dumon@option.com> -Date: Tue, 10 Mar 2009 17:29:47 +0100 -Subject: USB: unusual_devs: Add support for GI 0431 SD-Card interface -To: Phil Dibowitz <phil@ipom.com> -Cc: Greg KH <greg@kroah.com> -Message-ID: <20090310162947.GC7715@raptor> - -From: Jan Dumon <j.dumon@option.com> - -Enable the SD-Card interface on the GI 0431 HSUPA stick from Option. - -The unusual_devs.h entry is necessary because the device descriptor is -vendor-specific. That prevents usb-storage from binding to it as an -interface driver. - -T: Bus=07 Lev=01 Prnt=01 Port=01 Cnt=02 Dev#= 15 Spd=480 MxCh= 0 -D: Ver= 2.00 Cls=ff(vend.) Sub=ff Prot=ff MxPS=64 #Cfgs= 1 -P: Vendor=0af0 ProdID=7501 Rev= 0.00 -S: Manufacturer=Option N.V. -S: Product=Globetrotter HSUPA Modem -C:* #Ifs=11 Cfg#= 1 Atr=a0 MxPwr=500mA -I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=hso -E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms -I:* If#= 1 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) -E: Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms -I:* If#= 2 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) -E: Ad=83(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms -I:* If#= 3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=hso -E: Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms -I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) -E: Ad=85(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms -I:* If#= 5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) -E: Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=06(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms -I:* If#= 6 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=hso -E: Ad=87(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=07(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms -I:* If#= 7 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=hso -E: Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=08(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms -I:* If#= 8 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) -E: Ad=89(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=09(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms -I:* If#= 9 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=hso -E: Ad=8a(I) Atr=03(Int.) MxPS= 64 Ivl=2ms -E: Ad=8b(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=0a(O) Atr=02(Bulk) MxPS= 512 Ivl=4ms -I:* If#=10 Alt= 0 #EPs= 2 Cls=08(stor.) Sub=06 Prot=50 Driver=usb-storage -E: Ad=0b(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=8c(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms - -Signed-off-by: Jan Dumon <j.dumon@option.com> -Signed-off-by: Phil Dibowitz <phil@ipom.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/storage/unusual_devs.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/usb/storage/unusual_devs.h -+++ b/drivers/usb/storage/unusual_devs.h -@@ -1390,6 +1390,16 @@ UNUSUAL_DEV( 0x0af0, 0x7401, 0x0000, 0x0 - US_SC_DEVICE, US_PR_DEVICE, NULL, - 0 ), - -+/* Reported by Jan Dumon <j.dumon@option.com> -+ * This device (wrongly) has a vendor-specific device descriptor. -+ * The entry is needed so usb-storage can bind to it's mass-storage -+ * interface as an interface driver */ -+UNUSUAL_DEV( 0x0af0, 0x7501, 0x0000, 0x0000, -+ "Option", -+ "GI 0431 SD-Card", -+ US_SC_DEVICE, US_PR_DEVICE, NULL, -+ 0 ), -+ - /* Reported by Ben Efros <ben@pc-doctor.com> */ - UNUSUAL_DEV( 0x0bc2, 0x3010, 0x0000, 0x0000, - "Seagate", diff --git a/usb.current/usb-updated-unusual-devs-entry-for-usb-mass-storage-on-nokia-6233.patch b/usb.current/usb-updated-unusual-devs-entry-for-usb-mass-storage-on-nokia-6233.patch deleted file mode 100644 index 65eed1a0a46b97..00000000000000 --- a/usb.current/usb-updated-unusual-devs-entry-for-usb-mass-storage-on-nokia-6233.patch +++ /dev/null @@ -1,33 +0,0 @@ -From phil@ipom.com Mon Mar 16 20:30:16 2009 -From: Moritz Muehlenhoff <jmm@debian.org> -Date: Sat, 14 Mar 2009 00:43:21 +0100 -Subject: USB: Updated unusual-devs entry for USB mass storage on Nokia 6233 -To: Alan Stern <stern@rowland.harvard.edu>, jmm@debian.org, devnull@heitkoetter.net, Greg KH <greg@kroah.com>, Moritz Muehlenhoff <jmm@inutil.org> -Message-ID: <49BAEF99.2010302@ipom.com> - -From: Moritz Muehlenhoff <jmm@debian.org> - -Current firmware revision 5.60 still behaves the same, -so update the quirk up a (non-existing) 99.99 revision. - -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=493415 - -Signed-off-by: Moritz Muehlenhoff <jmm@debian.org> -Tested-by: Jan Heitkoetter <devnull@heitkoetter.net> -Signed-off-by: Phil Dibowitz <phil@ipom.com> - ---- - drivers/usb/storage/unusual_devs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/storage/unusual_devs.h -+++ b/drivers/usb/storage/unusual_devs.h -@@ -226,7 +226,7 @@ UNUSUAL_DEV( 0x0421, 0x047c, 0x0370, 0x - US_FL_MAX_SECTORS_64 ), - - /* Reported by Manuel Osdoba <manuel.osdoba@tu-ilmenau.de> */ --UNUSUAL_DEV( 0x0421, 0x0492, 0x0452, 0x0452, -+UNUSUAL_DEV( 0x0421, 0x0492, 0x0452, 0x9999, - "Nokia", - "Nokia 6233", - US_SC_DEVICE, US_PR_DEVICE, NULL, diff --git a/usb.current/usb-usbfs-keep-async-urbs-until-the-device-file-is-closed.patch b/usb.current/usb-usbfs-keep-async-urbs-until-the-device-file-is-closed.patch deleted file mode 100644 index 93d1a4745a6adf..00000000000000 --- a/usb.current/usb-usbfs-keep-async-urbs-until-the-device-file-is-closed.patch +++ /dev/null @@ -1,71 +0,0 @@ -From linux-usb-owner@vger.kernel.org Tue Mar 10 21:03:56 2009 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Mon, 9 Mar 2009 13:44:02 -0400 (EDT) -Subject: USB: usbfs: keep async URBs until the device file is closed -To: Greg KH <greg@kroah.com> -Cc: Martin Poupe <martin.poupe@upek.com> -Message-ID: <Pine.LNX.4.44L0.0903091341240.4008-100000@iolanthe.rowland.org> - -From: Alan Stern <stern@rowland.harvard.edu> - -The usbfs driver manages a list of completed asynchronous URBs. But -it is too eager to free the entries on this list: destroy_async() gets -called whenever an interface is unbound or a device is removed, and it -deallocates the outstanding struct async entries for all URBs on that -interface or device. This is wrong; the user program should be able -to reap an URB any time after it has completed, regardless of whether -or not the interface is still bound or the device is still present. - -This patch (as1222) moves the code for deallocating the completed list -entries from destroy_async() to usbdev_release(). The outstanding -entries won't be freed until the user program has closed the device -file, thereby eliminating any possibility that the remaining URBs -might still be reaped. - -This fixes a bug in which a program can hang in the USBDEVFS_REAPURB -ioctl when the device is unplugged. - -Reported-and-tested-by: Martin Poupe <martin.poupe@upek.com> -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/core/devio.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - ---- a/drivers/usb/core/devio.c -+++ b/drivers/usb/core/devio.c -@@ -359,11 +359,6 @@ static void destroy_async(struct dev_sta - spin_lock_irqsave(&ps->lock, flags); - } - spin_unlock_irqrestore(&ps->lock, flags); -- as = async_getcompleted(ps); -- while (as) { -- free_async(as); -- as = async_getcompleted(ps); -- } - } - - static void destroy_async_on_interface(struct dev_state *ps, -@@ -643,6 +638,7 @@ static int usbdev_release(struct inode * - struct dev_state *ps = file->private_data; - struct usb_device *dev = ps->dev; - unsigned int ifnum; -+ struct async *as; - - usb_lock_device(dev); - -@@ -661,6 +657,12 @@ static int usbdev_release(struct inode * - usb_unlock_device(dev); - usb_put_dev(dev); - put_pid(ps->disc_pid); -+ -+ as = async_getcompleted(ps); -+ while (as) { -+ free_async(as); -+ as = async_getcompleted(ps); -+ } - kfree(ps); - return 0; - } diff --git a/usb.current/usb-usbtmc-add-protocol-1-support.patch b/usb.current/usb-usbtmc-add-protocol-1-support.patch deleted file mode 100644 index f25db3b64d1a21..00000000000000 --- a/usb.current/usb-usbtmc-add-protocol-1-support.patch +++ /dev/null @@ -1,28 +0,0 @@ -From foo@baz Wed Mar 11 13:51:42 PDT 2009 -Date: Wed, 11 Mar 2009 13:51:42 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: usbtmc: add protocol 1 support - -The driver already supports the 1 protocol support, so just add it to -the MODULE_DEVICE_TABLE entry so it properly picks up these devices. - -Thanks to Jouni Rynö for pointing this out. - -Reported-by: Jouni Ryno <Jouni.Ryno@fmi.fi> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/class/usbtmc.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/class/usbtmc.c -+++ b/drivers/usb/class/usbtmc.c -@@ -50,6 +50,7 @@ - - static struct usb_device_id usbtmc_devices[] = { - { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 0), }, -+ { USB_INTERFACE_INFO(USB_CLASS_APP_SPEC, 3, 1), }, - { 0, } /* terminating entry */ - }; - MODULE_DEVICE_TABLE(usb, usbtmc_devices); diff --git a/usb.current/usb-usbtmc-fix-stupid-bug-in-open.patch b/usb.current/usb-usbtmc-fix-stupid-bug-in-open.patch deleted file mode 100644 index 98c1aea3fecc18..00000000000000 --- a/usb.current/usb-usbtmc-fix-stupid-bug-in-open.patch +++ /dev/null @@ -1,35 +0,0 @@ -From foo@baz Tue Mar 10 20:42:55 PDT 2009 -Date: Tue, 10 Mar 2009 20:42:55 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: usbtmc: fix stupid bug in open() - -open() will never succeed, as we always return -ENODEV. Fix this -obvious bug. - -Thanks to Jouni Ryno for reporting it. - -Reported-by: Jouni Ryno <Jouni.Ryno@fmi.fi> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/usb/class/usbtmc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/usb/class/usbtmc.c -+++ b/drivers/usb/class/usbtmc.c -@@ -106,12 +106,13 @@ static int usbtmc_open(struct inode *ino - { - struct usb_interface *intf; - struct usbtmc_device_data *data; -- int retval = -ENODEV; -+ int retval = 0; - - intf = usb_find_interface(&usbtmc_driver, iminor(inode)); - if (!intf) { - printk(KERN_ERR KBUILD_MODNAME - ": can not find device for minor %d", iminor(inode)); -+ retval = -ENODEV; - goto exit; - } - diff --git a/usb.current/usb-wusbcore-wa-xfer-fix-lock-imbalance.patch b/usb.current/usb-wusbcore-wa-xfer-fix-lock-imbalance.patch deleted file mode 100644 index b8e0b4466f4c3f..00000000000000 --- a/usb.current/usb-wusbcore-wa-xfer-fix-lock-imbalance.patch +++ /dev/null @@ -1,33 +0,0 @@ -From jirislaby@gmail.com Wed Mar 11 14:02:08 2009 -From: Jiri Slaby <jirislaby@gmail.com> -Date: Wed, 11 Mar 2009 21:47:40 +0100 -Subject: USB: wusbcore/wa-xfer, fix lock imbalance -To: gregkh@suse.de -Cc: Jiri Slaby <jirislaby@gmail.com>, Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> -Message-ID: <1236804460-1432-5-git-send-email-jirislaby@gmail.com> - - -Fix locking on one wa_urb_enqueue_b's fail path. There was omitted unlock. - -Signed-off-by: Jiri Slaby <jirislaby@gmail.com> -Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/wusbcore/wa-xfer.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/usb/wusbcore/wa-xfer.c -+++ b/drivers/usb/wusbcore/wa-xfer.c -@@ -921,8 +921,10 @@ static void wa_urb_enqueue_b(struct wa_x - result = -ENODEV; - /* FIXME: segmentation broken -- kills DWA */ - mutex_lock(&wusbhc->mutex); /* get a WUSB dev */ -- if (urb->dev == NULL) -+ if (urb->dev == NULL) { -+ mutex_unlock(&wusbhc->mutex); - goto error_dev_gone; -+ } - wusb_dev = __wusb_dev_get_by_usb_dev(wusbhc, urb->dev); - if (wusb_dev == NULL) { - mutex_unlock(&wusbhc->mutex); diff --git a/usb/usb-make-actual_length-in-struct-urb-field-u32.patch b/usb/usb-make-actual_length-in-struct-urb-field-u32.patch index 19ecb3a2c2fbfe..0bb1fac1ff55ce 100644 --- a/usb/usb-make-actual_length-in-struct-urb-field-u32.patch +++ b/usb/usb-make-actual_length-in-struct-urb-field-u32.patch @@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c -@@ -1942,7 +1942,7 @@ static void ftdi_process_read(struct wor +@@ -1947,7 +1947,7 @@ static void ftdi_process_read(struct wor priv->prev_status = new_status; } @@ -1 +1 @@ -2.6.29-rc8 +2.6.29-rc8-git4 |