This is a note to let you know that I've just added the patch titled
Revert "USB: option: add ID for ZTE MF 330"
to the 2.6.39-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-usb-option-add-id-for-zte-mf-330.patch
and it can be found in the queue-2.6.39 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
From 3095ec895fd5ec19a7cb60b5cbfa766d68a74a24 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <[email protected]>
Date: Tue, 7 Jun 2011 15:03:37 -0700
Subject: Revert "USB: option: add ID for ZTE MF 330"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Greg Kroah-Hartman <[email protected]>
commit 3095ec895fd5ec19a7cb60b5cbfa766d68a74a24 upstream.
This reverts commit a559d2c8c1bf652ea2d0ecd6ab4a250fcdb37db8.
Turns out that device id 0x1d6b:0x0002 is a USB hub, which causes havoc
when the option driver tries to bind to it.
So revert this as it doesn't seem to be needed at all.
Thanks to Michael Tokarev and Paweł Drobek for working on resolving this
issue.
Cc: Paweł Drobek <[email protected]>
Cc: Michael Tokarev <[email protected]>
Cc: Dominik Brodowski <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/usb/serial/option.c | 5 -----
1 file changed, 5 deletions(-)
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -311,10 +311,6 @@ static void option_instat_callback(struc
#define ZTE_PRODUCT_AC2726 0xfff5
#define ZTE_PRODUCT_AC8710T 0xffff
-/* ZTE PRODUCTS -- alternate vendor ID */
-#define ZTE_VENDOR_ID2 0x1d6b
-#define ZTE_PRODUCT_MF_330 0x0002
-
#define BENQ_VENDOR_ID 0x04a5
#define BENQ_PRODUCT_H10 0x4068
@@ -941,7 +937,6 @@ static const struct usb_device_id option
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710,
0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC2726,
0xff, 0xff, 0xff) },
{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_AC8710T,
0xff, 0xff, 0xff) },
- { USB_DEVICE(ZTE_VENDOR_ID2, ZTE_PRODUCT_MF_330) },
{ USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) },
{ USB_DEVICE(DLINK_VENDOR_ID, DLINK_PRODUCT_DWM_652) },
{ USB_DEVICE(ALINK_VENDOR_ID, DLINK_PRODUCT_DWM_652_U5) }, /* Yes,
ALINK_VENDOR_ID */
Patches currently in stable-queue which might be from [email protected] are
queue-2.6.39/ath9k-reset-chip-on-baseband-hang.patch
queue-2.6.39/exec-delay-address-limit-change-until-point-of-no-return.patch
queue-2.6.39/ubifs-fix-memory-leak-on-error-path.patch
queue-2.6.39/option-add-alcatel-x200-to-sendsetup-blacklist.patch
queue-2.6.39/xen-off-by-one-errors-in-multicalls.c.patch
queue-2.6.39/lguest-fix-timer-interrupt-setup.patch
queue-2.6.39/option-add-zoom-4597-modem-usb-ids.patch
queue-2.6.39/iwl4965-fix-5ghz-operation.patch
queue-2.6.39/ubifs-fix-shrinker-object-count-reports.patch
queue-2.6.39/hwmon-coretemp-fix-tjmax-detection-for-older-cpus.patch
queue-2.6.39/pci-set-pcie-maxpayload-for-card-during-hotplug-insertion.patch
queue-2.6.39/intel-iommu-dont-cache-iova-above-32bit.patch
queue-2.6.39/powerpc-4xx-fix-regression-in-smp-on-476.patch
queue-2.6.39/ath9k-set-40-mhz-rate-only-if-hw-is-configured-in-ht40.patch
queue-2.6.39/x86-amd-iommu-fix-3-possible-endless-loops.patch
queue-2.6.39/usb-option-add-blacklist-for-zte-k3765-z-19d2-2002.patch
queue-2.6.39/block-export-blk_-get-put-_queue.patch
queue-2.6.39/cifs-silence-printk-when-establishing-first-session-on.patch
queue-2.6.39/nl80211-fix-check-for-valid-ssid-size-in-scan-operations.patch
queue-2.6.39/fat-fix-corrupt-inode-flags-when-remove-attr_sys-flag.patch
queue-2.6.39/usbnet-cdc_ncm-add-missing-.reset_resume-hook.patch
queue-2.6.39/serial-core-remove-uart_update_termios.patch
queue-2.6.39/arch-tile-allocate-pci-irqs-later-in-boot.patch
queue-2.6.39/serial-core-move-termios-handling-to-uart_startup.patch
queue-2.6.39/genirq-fix-descriptor-init-on-non-sparse-irqs.patch
queue-2.6.39/intel-iommu-use-coherent-dma-mask-when-requested.patch
queue-2.6.39/intel-iommu-only-unlink-device-domains-from-iommu.patch
queue-2.6.39/asus-wmi-remove-__init-from-asus_wmi_platform_init.patch
queue-2.6.39/hwmon-coretemp-relax-target-temperature-range-check.patch
queue-2.6.39/x86-amd-iommu-use-only-per-device-dma_ops.patch
queue-2.6.39/media-fix-media-device-minor-registration.patch
queue-2.6.39/powerpc-fix-32-bit-smp-build.patch
queue-2.6.39/video-fix-use-after-free-by-vga16fb-on-rmmod.patch
queue-2.6.39/drm-radeon-kms-fix-for-radeon-on-systems-4gb-without.patch
queue-2.6.39/fix-oops-caused-by-queue-refcounting-failure.patch
queue-2.6.39/intel-iommu-speed-up-processing-of-the-identity_mapping.patch
queue-2.6.39/iwl4965-correctly-validate-temperature-value.patch
queue-2.6.39/mm-fix-enospc-returned-by-handle_mm_fault.patch
queue-2.6.39/usb-storage-redo-incorrect-reads.patch
queue-2.6.39/intel-iommu-add-domain-check-in-domain_remove_one_dev_info.patch
queue-2.6.39/drm-radeon-kms-viewport-height-has-to-be-even.patch
queue-2.6.39/zd1211rw-fix-to-work-on-ohci.patch
queue-2.6.39/lockdep-fix-lock_is_held-on-recursion.patch
queue-2.6.39/drm-i915-add-a-no-lvds-quirk-for-the-asus-eeebox-pc-eb1007.patch
queue-2.6.39/intel-iommu-flush-unmaps-at-domain_exit.patch
queue-2.6.39/usb-cdc-acm-adding-second-acm-channel-support-for-nokia-e7.patch
queue-2.6.39/x86-amd-iommu-fix-boot-crash-with-hidden-pci-devices.patch
queue-2.6.39/nbd-limit-module-parameters-to-a-sane-value.patch
queue-2.6.39/usb-core-tolerate-protocol-stall-during-hub-and-port.patch
queue-2.6.39/staging-gma500-get-control-from-firmware-framebuffer-if.patch
queue-2.6.39/intel-iommu-remove-host-bridge-devices-from-identity.patch
queue-2.6.39/ath9k-fix-two-more-bugs-in-tx-power.patch
queue-2.6.39/revert-usb-option-add-id-for-zte-mf-330.patch
queue-2.6.39/block-blkdev_get-should-access-bd_disk-only-after.patch
queue-2.6.39/usb-serial-add-another-4n-galaxy.de-pid-to-ftdi_sio-driver.patch
queue-2.6.39/option-add-prolink-ph300-modem-ids.patch
queue-2.6.39/intel-iommu-check-for-identity-mapping-candidate-using.patch
queue-2.6.39/serial-core-do-not-set-dtr-rts-twice-on-startup.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
