diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-26 15:58:33 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-26 15:58:33 -0700 |
| commit | 28993116a3137ce81b7a0e43f94879698fbc4d49 (patch) | |
| tree | 7bc1a88579fa00096f1df9b9f703fd1c98d88b52 | |
| parent | 05eb87b12a0ff0b645dcf70ccc91942638f84802 (diff) | |
| download | patches-28993116a3137ce81b7a0e43f94879698fbc4d49.tar.gz | |
usb patch
| -rw-r--r-- | driver-core/cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch (renamed from cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch) | 3 | ||||
| -rw-r--r-- | series | 2 | ||||
| -rw-r--r-- | usb/usb-option-add-huawei-k3765-k4505-devices-to-work-properly.patch | 57 | ||||
| -rw-r--r-- | version | 2 |
4 files changed, 62 insertions, 2 deletions
diff --git a/cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch b/driver-core/cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch index dc173400cbbb4a..4d41d5284cec30 100644 --- a/cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch +++ b/driver-core/cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch @@ -15,7 +15,8 @@ a mount point in sysfs. For cgroupfs, this should be in /sys/fs/cgroup/ This change provides that mount point when the cgroup filesystem is registered in the kernel. -Cc: Paul Menage <menage@google.com> +Acked-by: Paul Menage <menage@google.com> +Acked-by: Dhaval Giani <dhaval.giani@gmail.com> Cc: Li Zefan <lizf@cn.fujitsu.com> Cc: Lennart Poettering <lennart@poettering.net> Cc: Kay Sievers <kay.sievers@vrfy.org> @@ -48,6 +48,7 @@ driver-core/sysfs-fix-one-more-signature-discrepancy-between-sysfs-implementatio driver-core/debugfs-no-longer-needs-to-depend-on-sysfs.patch driver-core/driver-core-fix-memory-leak-one-one-error-path-in-bus_register.patch driver-core/driver-core-add-bus_notify_bind_driver.patch +driver-core/cgroupfs-create-sys-fs-cgroup-to-mount-cgroupfs-on.patch # can we really drop it? (nope, not yet...) #driver-core/driver-core-remove-config_sysfs_deprecated.patch @@ -255,6 +256,7 @@ usb/usb-add-usb-ehci-support-for-mpc5121-soc.patch usb/usb-serial-enabling-support-for-segway-rmp-in-ftdi_sio.patch usb/usb-imx21-hcd-set-task-state-with-schedule_timeout_uninterruptible.patch usb/usb-gadget-file_storage-serial-parameter-even-if-not-test-mode.patch +usb/usb-option-add-huawei-k3765-k4505-devices-to-work-properly.patch # staging stuff is now in the staging-next tree on git.kernel.org diff --git a/usb/usb-option-add-huawei-k3765-k4505-devices-to-work-properly.patch b/usb/usb-option-add-huawei-k3765-k4505-devices-to-work-properly.patch new file mode 100644 index 00000000000000..a52fec82363adf --- /dev/null +++ b/usb/usb-option-add-huawei-k3765-k4505-devices-to-work-properly.patch @@ -0,0 +1,57 @@ +From linux-usb-owner@vger.kernel.org Mon Jul 26 15:51:34 2010 +From: Andrew Bird <ajb@spheresystems.co.uk> +To: greg@kroah.com +Cc: linux-usb@vger.kernel.org, ajb@spheresystems.co.uk +Subject: USB: option: add huawei k3765 k4505 devices to work properly +Date: Fri, 23 Jul 2010 16:04:41 +0100 +Message-Id: <1279897481-10442-1-git-send-email-ajb@spheresystems.co.uk> + +This patch adds the product IDs of Huawei's K3765 and K4505 mobile +broadband usb modems to option.c. It also adds a quirk to the option +probe function so that binding to the device's network interface(class +0xff) is avoided. This is necessary to allow another driver to bind to +that, and to avoid programs like wvdial opening a nonfunctioning tty +during modem discovery. + +Signed-off-by: Andrew Bird <ajb@spheresystems.co.uk> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/option.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -145,6 +145,8 @@ static void option_instat_callback(struc + #define HUAWEI_PRODUCT_E143D 0x143D + #define HUAWEI_PRODUCT_E143E 0x143E + #define HUAWEI_PRODUCT_E143F 0x143F ++#define HUAWEI_PRODUCT_K4505 0x1464 ++#define HUAWEI_PRODUCT_K3765 0x1465 + #define HUAWEI_PRODUCT_E14AC 0x14AC + #define HUAWEI_PRODUCT_ETS1220 0x1803 + +@@ -480,6 +482,8 @@ static const struct usb_device_id option + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143D, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143E, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E143F, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) }, + { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC) }, + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */ +@@ -1015,6 +1019,13 @@ static int option_probe(struct usb_seria + serial->interface->cur_altsetting->desc.bInterfaceClass != 0xff) + return -ENODEV; + ++ /* Don't bind network interfaces on Huawei K3765 & K4505 */ ++ if (serial->dev->descriptor.idVendor == HUAWEI_VENDOR_ID && ++ (serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K3765 || ++ serial->dev->descriptor.idProduct == HUAWEI_PRODUCT_K4505) && ++ serial->interface->cur_altsetting->desc.bInterfaceNumber == 1) ++ return -ENODEV; ++ + data = serial->private = kzalloc(sizeof(struct usb_wwan_intf_private), GFP_KERNEL); + + if (!data) @@ -1 +1 @@ -2.6.35-rc6 +2.6.35-rc6-git1 |