diff options
19 files changed, 5 insertions, 1014 deletions
diff --git a/driver-core.current/documentation-stable-rules-upstream-commit-id-requirement-reworded.patch b/driver-core.current/documentation-stable-rules-upstream-commit-id-requirement-reworded.patch deleted file mode 100644 index 71b1a118ed79dd..00000000000000 --- a/driver-core.current/documentation-stable-rules-upstream-commit-id-requirement-reworded.patch +++ /dev/null @@ -1,45 +0,0 @@ -From stefanr@s5r6.in-berlin.de Wed Apr 14 11:26:00 2010 -From: Stefan Richter <stefanr@s5r6.in-berlin.de> -Date: Thu, 1 Apr 2010 22:01:52 +0200 (CEST) -Subject: Documentation: -stable rules: upstream commit ID requirement reworded -To: Greg KH <gregkh@suse.de>, Randy Dunlap <rdunlap@xenotime.net> -Cc: David Miller <davem@davemloft.net>, Willy Tarreau <w@1wt.eu>, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org -Message-ID: <tkrat.768beea282d5d26b@s5r6.in-berlin.de> - - -It is a hard requirement to include the upstream commit ID in the -changelog of a -stable submission, not just a courtesy to the stable -team. This concerns only mail submission though, which is no longer -the only way into stable. (Also, fix a double "the".) - -Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> -Acked-by: Randy Dunlap <rdunlap@xenotime.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - Documentation/stable_kernel_rules.txt | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - ---- a/Documentation/stable_kernel_rules.txt -+++ b/Documentation/stable_kernel_rules.txt -@@ -18,16 +18,15 @@ Rules on what kind of patches are accept - - It cannot contain any "trivial" fixes in it (spelling changes, - whitespace cleanups, etc). - - It must follow the Documentation/SubmittingPatches rules. -- - It or an equivalent fix must already exist in Linus' tree. Quote the -- respective commit ID in Linus' tree in your patch submission to -stable. -+ - It or an equivalent fix must already exist in Linus' tree (upstream). - - - Procedure for submitting patches to the -stable tree: - - - Send the patch, after verifying that it follows the above rules, to -- stable@kernel.org. -- - To have the patch automatically included in the stable tree, add the -- the tag -+ stable@kernel.org. You must note the upstream commit ID in the changelog -+ of your submission. -+ - To have the patch automatically included in the stable tree, add the tag - Cc: stable@kernel.org - in the sign-off area. Once the patch is merged it will be applied to - the stable tree without anything else needing to be done by the author diff --git a/driver-core.current/sysfs-use-sysfs_attr_init-in-asus-atk0110-driver.patch b/driver-core.current/sysfs-use-sysfs_attr_init-in-asus-atk0110-driver.patch deleted file mode 100644 index abe153ceb23de0..00000000000000 --- a/driver-core.current/sysfs-use-sysfs_attr_init-in-asus-atk0110-driver.patch +++ /dev/null @@ -1,118 +0,0 @@ -From jkosina@suse.cz Thu Apr 22 13:58:15 2010 -From: Jiri Kosina <jkosina@suse.cz> -Date: Thu, 15 Apr 2010 02:45:25 +0200 (CEST) -Subject: sysfs: use sysfs_attr_init in ASUS atk0110 driver -To: Dhaval Giani <dhaval.giani@gmail.com>, Greg Kroah-Hartman <gregkh@suse.de> -Cc: a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, "Eric W. Biederman" <ebiederm@xmission.com> -Message-ID: <alpine.LRH.2.00.1004150239391.28179@twin.jikos.cz> - -From: Jiri Kosina <jkosina@suse.cz> - -Annotate dynamic sysfs attribute in atk_create_files(). This gets -rid of the following lockdep warning: - - BUG: key ffff8800379ca670 not in .data! - ------------[ cut here ]------------ - WARNING: at kernel/lockdep.c:2696 lockdep_init_map+0xd2/0x108() - Hardware name: P5K PRO - Modules linked in: asus_atk0110(+) pata_acpi firewire_ohci ata_generic - dm_multipath firewire_core crc_itu_t pata_marvell floppy - Pid: 599, comm: modprobe Not tainted 2.6.34-rc4 #27 - Call Trace: - [<ffffffff8104cdb0>] warn_slowpath_common+0x7c/0x94 - [<ffffffff8104cddc>] warn_slowpath_null+0x14/0x16 - [<ffffffff81077c4d>] lockdep_init_map+0xd2/0x108 - [<ffffffff81165873>] sysfs_add_file_mode+0x66/0xa2 - [<ffffffff811658c0>] sysfs_add_file+0x11/0x13 - [<ffffffff8116594b>] sysfs_create_file+0x2a/0x2c - [<ffffffff812c1f9c>] device_create_file+0x19/0x1b - [<ffffffffa005b4fd>] atk_add+0x58b/0x72e [asus_atk0110] - [<ffffffff812572a1>] acpi_device_probe+0x50/0x122 - [<ffffffff812c46af>] driver_probe_device+0xa2/0x127 - [<ffffffff812c4783>] __driver_attach+0x4f/0x6b - [<ffffffff812c4734>] ? __driver_attach+0x0/0x6b - [<ffffffff812c3c94>] bus_for_each_dev+0x59/0x8e - [<ffffffff812c4519>] driver_attach+0x1e/0x20 - [<ffffffff812c4152>] bus_add_driver+0xb9/0x207 - [<ffffffff812c4a5f>] driver_register+0x9d/0x10e - [<ffffffffa005f000>] ? atk0110_init+0x0/0x31 [asus_atk0110] - [<ffffffff81257c7c>] acpi_bus_register_driver+0x43/0x45 - [<ffffffffa005f015>] atk0110_init+0x15/0x31 [asus_atk0110] - [<ffffffffa005f000>] ? atk0110_init+0x0/0x31 [asus_atk0110] - [<ffffffff81002069>] do_one_initcall+0x5e/0x15e - [<ffffffff81085075>] sys_init_module+0xd8/0x239 - [<ffffffff81009cf2>] system_call_fastpath+0x16/0x1b - ---[ end trace 4d0c84007055efb9 ]--- - BUG: key ffff8800379ca638 not in .data! - BUG: key ffff8800379ca6a8 not in .data! - BUG: key ffff8800379ca6e0 not in .data! - BUG: key ffff880036f73670 not in .data! - BUG: key ffff880036f73638 not in .data! - BUG: key ffff880036f736a8 not in .data! - BUG: key ffff880036f736e0 not in .data! - BUG: key ffff880036f76c70 not in .data! - BUG: key ffff880036f76c38 not in .data! - BUG: key ffff880036f76ca8 not in .data! - BUG: key ffff880036f76ce0 not in .data! - BUG: key ffff8800368e7670 not in .data! - BUG: key ffff8800368e7638 not in .data! - BUG: key ffff8800368e76a8 not in .data! - BUG: key ffff8800368e76e0 not in .data! - BUG: key ffff880036ef7670 not in .data! - BUG: key ffff880036ef7638 not in .data! - BUG: key ffff880036ef76a8 not in .data! - BUG: key ffff880036ef76e0 not in .data! - BUG: key ffff8800373ccc70 not in .data! - BUG: key ffff8800373ccc38 not in .data! - BUG: key ffff8800373ccca8 not in .data! - BUG: key ffff8800373ccce0 not in .data! - BUG: key ffff880037a60870 not in .data! - BUG: key ffff880037a60838 not in .data! - BUG: key ffff880037a608a8 not in .data! - BUG: key ffff880037a608e0 not in .data! - BUG: key ffff880037355070 not in .data! - BUG: key ffff880037355038 not in .data! - BUG: key ffff8800373550a8 not in .data! - BUG: key ffff8800373550e0 not in .data! - BUG: key ffff8800378c2670 not in .data! - BUG: key ffff8800378c2638 not in .data! - BUG: key ffff8800378c26a8 not in .data! - BUG: key ffff8800378c26e0 not in .data! - BUG: key ffff880036ef7e70 not in .data! - BUG: key ffff880036ef7e38 not in .data! - BUG: key ffff880036ef7ea8 not in .data! - BUG: key ffff880036ef7ee0 not in .data! - -Cc: Eric W. Biederman <ebiederm@xmission.com> -Reported-by: Dhaval Giani <dhaval.giani@gmail.com> -Signed-off-by: Jiri Kosina <jkosina@suse.cz> -Tested-by: Dhaval Giani <dhaval.giani@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/hwmon/asus_atk0110.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/hwmon/asus_atk0110.c -+++ b/drivers/hwmon/asus_atk0110.c -@@ -1169,15 +1169,19 @@ static int atk_create_files(struct atk_d - int err; - - list_for_each_entry(s, &data->sensor_list, list) { -+ sysfs_attr_init(&s->input_attr.attr); - err = device_create_file(data->hwmon_dev, &s->input_attr); - if (err) - return err; -+ sysfs_attr_init(&s->label_attr.attr); - err = device_create_file(data->hwmon_dev, &s->label_attr); - if (err) - return err; -+ sysfs_attr_init(&s->limit1_attr.attr); - err = device_create_file(data->hwmon_dev, &s->limit1_attr); - if (err) - return err; -+ sysfs_attr_init(&s->limit2_attr.attr); - err = device_create_file(data->hwmon_dev, &s->limit2_attr); - if (err) - return err; @@ -8,9 +8,6 @@ gregkh/gkh-version.patch ################################# # Driver core patches for 2.6.34 ################################# -driver-core.current/documentation-stable-rules-upstream-commit-id-requirement-reworded.patch -driver-core.current/documentation-howto-update-git-home-url.patch -driver-core.current/sysfs-use-sysfs_attr_init-in-asus-atk0110-driver.patch # round 2 driver-core.current/drivers-base-cpu.c-fix-the-output-from-sys-devices-system-cpu-offline.patch @@ -26,18 +23,6 @@ tty.current/serial-drivers-serial-pmac_zilog.c-add-missing-unlock.patch ################################# # USB patches for 2.6.34 ################################# -usb.current/usb-ti_usb_3410_5052-adding-multitech-dialup-fax-modem-devices.patch -usb.current/usb-fixed-bug-in-usbsevseg-using-usb-autosuspend-incorrectly.patch -usb.current/usb-ehci-omap-fix-kernel-panic-with-rmmod.patch -usb.current/usb-wusb-don-t-overflow-the-keep-alive-ie-buffer.patch -usb.current/usb-qcaux-add-lg-rumor-and-sanyo-katana-lx-device-ids.patch -usb.current/usb-ohci-da8xx-omap-l1x-fix-up-macro-rename.patch -usb.current/usb-add-id-for-hp-ev2210-a.k.a-sierra-mc5725-minipci-e-cell-modem.patch -usb.current/usb-pl2303-add-adlink-nd-6530-usb-ids.patch -usb.current/usb-fix-remote-wakeup-settings-during-system-sleep.patch -usb.current/usb-ehci-defer-reclamation-of-sitds.patch -usb.current/usb-put-claimed-interfaces-in-the-suspended-state.patch -usb.current/usb-increase-timeout-value-for-device-reset.patch # round 2 usb.current/musb-fix-power-field-to-hold-all-possible-values.patch @@ -86,7 +71,6 @@ staging.current/staging-rtl8192su-add-usb-id-for-0bda-8171.patch staging.current/staging-usbip-fix-deadlock.patch staging.current/staging-dt3155-fix-50hz-configuration.patch staging.current/staging-rtl8192su-add-support-for-belkin-f5d8053-v6.patch -staging.current/staging-fix-dt3155-build.patch staging.current/staging-rt2860-add-belkin-f5d8055-wireless-n-usb-dongle-device-id.patch staging.current/staging-add-add-sitecom-wl-349-to-rtl8192su.patch staging.current/staging-iio-fix-up-the-iio_get_new_idr_val-comment.patch diff --git a/staging.current/staging-dt3155-fix-50hz-configuration.patch b/staging.current/staging-dt3155-fix-50hz-configuration.patch index b0b8ebe4096c46..cbba5504c57ca9 100644 --- a/staging.current/staging-dt3155-fix-50hz-configuration.patch +++ b/staging.current/staging-dt3155-fix-50hz-configuration.patch @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/dt3155/dt3155_drv.c +++ b/drivers/staging/dt3155/dt3155_drv.c -@@ -472,9 +472,9 @@ static void dt3155_init_isr(int minor) +@@ -464,9 +464,9 @@ static void dt3155_init_isr(int minor) /* 50/60 Hz should be set before this point but let's make sure it is */ /* right anyway */ diff --git a/staging.current/staging-fix-dt3155-build.patch b/staging.current/staging-fix-dt3155-build.patch deleted file mode 100644 index 58dc3b09f58c66..00000000000000 --- a/staging.current/staging-fix-dt3155-build.patch +++ /dev/null @@ -1,64 +0,0 @@ -From randy.dunlap@oracle.com Mon Apr 26 14:16:59 2010 -From: Randy Dunlap <randy.dunlap@oracle.com> -Date: Wed, 21 Apr 2010 14:32:47 -0700 -Subject: Staging: fix dt3155 build -To: Linus Torvalds <torvalds@linux-foundation.org>, gregkh@suse.de -Cc: Scott Smedley <ss@aao.gov.au> -Message-ID: <20100421143247.eb7e9f39.randy.dunlap@oracle.com> - - -From: Randy Dunlap <randy.dunlap@oracle.com> - -When the dt3155 driver is built-in (not as a loadable module), -these build errors happen: - -drivers/staging/dt3155/dt3155_drv.c:1047: error: implicit declaration of function 'request_irq' -drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_SHARED' undeclared (first use in this function) -drivers/staging/dt3155/dt3155_drv.c:1048: error: 'IRQF_DISABLED' undeclared (first use in this function) -drivers/staging/dt3155/dt3155_drv.c:1091: error: implicit declaration of function 'free_irq' - -so remove the #ifdef MODULE check since it's not needed. -Also remove the CONFIG_PCI check since the Kconfig file already -requires that. - -Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> -Cc: Scott Smedley <ss@aao.gov.au> -Tested-by: Jan III Sobieski <jan3sobi3ski@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/staging/dt3155/dt3155_drv.c | 14 +++----------- - 1 file changed, 3 insertions(+), 11 deletions(-) - ---- a/drivers/staging/dt3155/dt3155_drv.c -+++ b/drivers/staging/dt3155/dt3155_drv.c -@@ -57,19 +57,8 @@ MA 02111-1307 USA - - extern void printques(int); - --#ifdef MODULE - #include <linux/module.h> - #include <linux/interrupt.h> -- -- --MODULE_LICENSE("GPL"); -- --#endif -- --#ifndef CONFIG_PCI --#error "DT3155 : Kernel PCI support not enabled (DT3155 drive requires PCI)" --#endif -- - #include <linux/pci.h> - #include <linux/types.h> - #include <linux/poll.h> -@@ -84,6 +73,9 @@ MODULE_LICENSE("GPL"); - #include "dt3155_io.h" - #include "allocator.h" - -+ -+MODULE_LICENSE("GPL"); -+ - /* Error variable. Zero means no error. */ - int dt3155_errno = 0; - diff --git a/usb.current/usb-add-id-for-hp-ev2210-a.k.a-sierra-mc5725-minipci-e-cell-modem.patch b/usb.current/usb-add-id-for-hp-ev2210-a.k.a-sierra-mc5725-minipci-e-cell-modem.patch deleted file mode 100644 index 39afee2ef3115f..00000000000000 --- a/usb.current/usb-add-id-for-hp-ev2210-a.k.a-sierra-mc5725-minipci-e-cell-modem.patch +++ /dev/null @@ -1,29 +0,0 @@ -From kassah@gmail.com Wed Apr 14 11:23:34 2010 -From: William Lightning <kassah@gmail.com> -Date: Fri, 26 Mar 2010 10:51:20 -0700 -Subject: USB: Add id for HP ev2210 a.k.a Sierra MC5725 miniPCI-e Cell Modem. -To: linux-usb@vger.kernel.org -Cc: kassah@gmail.com -Message-ID: <1269625880-18253-1-git-send-email-kassah@gmail.com> - - -From: William Lightning <kassah@gmail.com> - - -Signed-off-by: William Lightning <kassah@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/sierra.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/serial/sierra.c -+++ b/drivers/usb/serial/sierra.c -@@ -230,6 +230,7 @@ static const struct sierra_iface_info di - static const struct usb_device_id id_table[] = { - { USB_DEVICE(0x0F3D, 0x0112) }, /* Airprime/Sierra PC 5220 */ - { USB_DEVICE(0x03F0, 0x1B1D) }, /* HP ev2200 a.k.a MC5720 */ -+ { USB_DEVICE(0x03F0, 0x211D) }, /* HP ev2210 a.k.a MC5725 */ - { USB_DEVICE(0x03F0, 0x1E1D) }, /* HP hs2300 a.k.a MC8775 */ - - { USB_DEVICE(0x1199, 0x0017) }, /* Sierra Wireless EM5625 */ diff --git a/usb.current/usb-ehci-defer-reclamation-of-sitds.patch b/usb.current/usb-ehci-defer-reclamation-of-sitds.patch deleted file mode 100644 index 90d59f02c64f10..00000000000000 --- a/usb.current/usb-ehci-defer-reclamation-of-sitds.patch +++ /dev/null @@ -1,161 +0,0 @@ -From stern@rowland.harvard.edu Wed Apr 14 11:29:47 2010 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Thu, 8 Apr 2010 16:56:37 -0400 (EDT) -Subject: USB: EHCI: defer reclamation of siTDs -To: Greg KH <greg@kroah.com> -Cc: Nate Case <ncase@xes-inc.com> -Message-ID: <Pine.LNX.4.44L0.1004081654370.1720-100000@iolanthe.rowland.org> - - -This patch (as1369) fixes a problem in ehci-hcd. Some controllers -occasionally run into trouble when the driver reclaims siTDs too -quickly. This can happen while streaming audio; it causes the -controller to crash. - -The patch changes siTD reclamation to work the same way as iTD -reclamation: Completed siTDs are stored on a list and not reused until -at least one frame has passed. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Tested-by: Nate Case <ncase@xes-inc.com> -CC: <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-hcd.c | 1 + - drivers/usb/host/ehci-mem.c | 2 +- - drivers/usb/host/ehci-sched.c | 40 +++++++++++++++++++++++++++++++--------- - drivers/usb/host/ehci.h | 5 +++-- - 4 files changed, 36 insertions(+), 12 deletions(-) - ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c -@@ -543,6 +543,7 @@ static int ehci_init(struct usb_hcd *hcd - */ - ehci->periodic_size = DEFAULT_I_TDPS; - INIT_LIST_HEAD(&ehci->cached_itd_list); -+ INIT_LIST_HEAD(&ehci->cached_sitd_list); - if ((retval = ehci_mem_init(ehci, GFP_KERNEL)) < 0) - return retval; - ---- a/drivers/usb/host/ehci-mem.c -+++ b/drivers/usb/host/ehci-mem.c -@@ -136,7 +136,7 @@ static inline void qh_put (struct ehci_q - - static void ehci_mem_cleanup (struct ehci_hcd *ehci) - { -- free_cached_itd_list(ehci); -+ free_cached_lists(ehci); - if (ehci->async) - qh_put (ehci->async); - ehci->async = NULL; ---- a/drivers/usb/host/ehci-sched.c -+++ b/drivers/usb/host/ehci-sched.c -@@ -510,7 +510,7 @@ static int disable_periodic (struct ehci - ehci_writel(ehci, cmd, &ehci->regs->command); - /* posted write ... */ - -- free_cached_itd_list(ehci); -+ free_cached_lists(ehci); - - ehci->next_uframe = -1; - return 0; -@@ -2139,13 +2139,27 @@ sitd_complete ( - (stream->bEndpointAddress & USB_DIR_IN) ? "in" : "out"); - } - iso_stream_put (ehci, stream); -- /* OK to recycle this SITD now that its completion callback ran. */ -+ - done: - sitd->urb = NULL; -- sitd->stream = NULL; -- list_move(&sitd->sitd_list, &stream->free_list); -- iso_stream_put(ehci, stream); -- -+ if (ehci->clock_frame != sitd->frame) { -+ /* OK to recycle this SITD now. */ -+ sitd->stream = NULL; -+ list_move(&sitd->sitd_list, &stream->free_list); -+ iso_stream_put(ehci, stream); -+ } else { -+ /* HW might remember this SITD, so we can't recycle it yet. -+ * Move it to a safe place until a new frame starts. -+ */ -+ list_move(&sitd->sitd_list, &ehci->cached_sitd_list); -+ if (stream->refcount == 2) { -+ /* If iso_stream_put() were called here, stream -+ * would be freed. Instead, just prevent reuse. -+ */ -+ stream->ep->hcpriv = NULL; -+ stream->ep = NULL; -+ } -+ } - return retval; - } - -@@ -2211,9 +2225,10 @@ done: - - /*-------------------------------------------------------------------------*/ - --static void free_cached_itd_list(struct ehci_hcd *ehci) -+static void free_cached_lists(struct ehci_hcd *ehci) - { - struct ehci_itd *itd, *n; -+ struct ehci_sitd *sitd, *sn; - - list_for_each_entry_safe(itd, n, &ehci->cached_itd_list, itd_list) { - struct ehci_iso_stream *stream = itd->stream; -@@ -2221,6 +2236,13 @@ static void free_cached_itd_list(struct - list_move(&itd->itd_list, &stream->free_list); - iso_stream_put(ehci, stream); - } -+ -+ list_for_each_entry_safe(sitd, sn, &ehci->cached_sitd_list, sitd_list) { -+ struct ehci_iso_stream *stream = sitd->stream; -+ sitd->stream = NULL; -+ list_move(&sitd->sitd_list, &stream->free_list); -+ iso_stream_put(ehci, stream); -+ } - } - - /*-------------------------------------------------------------------------*/ -@@ -2247,7 +2269,7 @@ scan_periodic (struct ehci_hcd *ehci) - clock_frame = -1; - } - if (ehci->clock_frame != clock_frame) { -- free_cached_itd_list(ehci); -+ free_cached_lists(ehci); - ehci->clock_frame = clock_frame; - } - clock %= mod; -@@ -2414,7 +2436,7 @@ restart: - clock = now; - clock_frame = clock >> 3; - if (ehci->clock_frame != clock_frame) { -- free_cached_itd_list(ehci); -+ free_cached_lists(ehci); - ehci->clock_frame = clock_frame; - } - } else { ---- a/drivers/usb/host/ehci.h -+++ b/drivers/usb/host/ehci.h -@@ -87,8 +87,9 @@ struct ehci_hcd { /* one per controlle - int next_uframe; /* scan periodic, start here */ - unsigned periodic_sched; /* periodic activity count */ - -- /* list of itds completed while clock_frame was still active */ -+ /* list of itds & sitds completed while clock_frame was still active */ - struct list_head cached_itd_list; -+ struct list_head cached_sitd_list; - unsigned clock_frame; - - /* per root hub port */ -@@ -195,7 +196,7 @@ timer_action_done (struct ehci_hcd *ehci - clear_bit (action, &ehci->actions); - } - --static void free_cached_itd_list(struct ehci_hcd *ehci); -+static void free_cached_lists(struct ehci_hcd *ehci); - - /*-------------------------------------------------------------------------*/ - diff --git a/usb.current/usb-ehci-omap-fix-kernel-panic-with-rmmod.patch b/usb.current/usb-ehci-omap-fix-kernel-panic-with-rmmod.patch deleted file mode 100644 index 751b4d312264ee..00000000000000 --- a/usb.current/usb-ehci-omap-fix-kernel-panic-with-rmmod.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ajay.gupta@ti.com Wed Apr 14 11:17:01 2010 -From: Ajay Kumar Gupta <ajay.gupta@ti.com> -Date: Thu, 18 Mar 2010 16:58:35 +0530 -Subject: USB: ehci: omap: fix kernel panic with rmmod -To: linux-usb@vger.kernel.org -Cc: linux-omap@vger.kernel.org, Ajay Kumar Gupta <ajay.gupta@ti.com> -Message-ID: <1268911715-10279-1-git-send-email-ajay.gupta@ti.com> - - -Sets the regulator values to NULL if they are not defined. This -is required to fix the kernel panic in exit path when EHCI module -is removed on the platforms where EHCI regulator are not set. - -Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-omap.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/drivers/usb/host/ehci-omap.c -+++ b/drivers/usb/host/ehci-omap.c -@@ -629,11 +629,13 @@ static int ehci_hcd_omap_probe(struct pl - } - snprintf(supply, sizeof(supply), "hsusb%d", i); - omap->regulator[i] = regulator_get(omap->dev, supply); -- if (IS_ERR(omap->regulator[i])) -+ if (IS_ERR(omap->regulator[i])) { -+ omap->regulator[i] = NULL; - dev_dbg(&pdev->dev, - "failed to get ehci port%d regulator\n", i); -- else -+ } else { - regulator_enable(omap->regulator[i]); -+ } - } - - ret = omap_start_ehc(omap, hcd); diff --git a/usb.current/usb-fix-remote-wakeup-settings-during-system-sleep.patch b/usb.current/usb-fix-remote-wakeup-settings-during-system-sleep.patch deleted file mode 100644 index 9c6cdd29239757..00000000000000 --- a/usb.current/usb-fix-remote-wakeup-settings-during-system-sleep.patch +++ /dev/null @@ -1,84 +0,0 @@ -From stern@rowland.harvard.edu Wed Apr 14 11:27:22 2010 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Fri, 2 Apr 2010 13:20:11 -0400 (EDT) -Subject: USB: fix remote wakeup settings during system sleep -To: Greg KH <greg@kroah.com> -Cc: Erik Andrén <erik.andren@gmail.com>, USB list <linux-usb@vger.kernel.org> -Message-ID: <Pine.LNX.4.44L0.1004021308150.1324-100000@iolanthe.rowland.org> - - -This patch (as1363) changes the way USB remote wakeup is handled -during system sleeps. It won't be enabled unless an interface driver -specifically needs it. Also, it won't be enabled during the FREEZE or -QUIESCE phases of hibernation, when the system doesn't respond to -wakeup events anyway. Finally, if the device is already -runtime-suspended with remote wakeup enabled, but wakeup is supposed -to be disabled for the system sleep, the device gets woken up so that -it can be suspended again with the proper wakeup setting. - -This will fix problems people have reported with certain USB webcams -that generate wakeup requests when they shouldn't, and as a result -cause system suspends to fail. See - - https://bugs.launchpad.net/ubuntu/+source/linux/+bug/515109 - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Tested-by: Erik Andrén <erik.andren@gmail.com> -CC: <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/core/driver.c | 36 +++++++++++++++++++++++++++++++++++- - 1 file changed, 35 insertions(+), 1 deletion(-) - ---- a/drivers/usb/core/driver.c -+++ b/drivers/usb/core/driver.c -@@ -1263,13 +1263,47 @@ static int usb_resume_both(struct usb_de - return status; - } - -+static void choose_wakeup(struct usb_device *udev, pm_message_t msg) -+{ -+ int w, i; -+ struct usb_interface *intf; -+ -+ /* Remote wakeup is needed only when we actually go to sleep. -+ * For things like FREEZE and QUIESCE, if the device is already -+ * autosuspended then its current wakeup setting is okay. -+ */ -+ if (msg.event == PM_EVENT_FREEZE || msg.event == PM_EVENT_QUIESCE) { -+ if (udev->state != USB_STATE_SUSPENDED) -+ udev->do_remote_wakeup = 0; -+ return; -+ } -+ -+ /* If remote wakeup is permitted, see whether any interface drivers -+ * actually want it. -+ */ -+ w = 0; -+ if (device_may_wakeup(&udev->dev) && udev->actconfig) { -+ for (i = 0; i < udev->actconfig->desc.bNumInterfaces; i++) { -+ intf = udev->actconfig->interface[i]; -+ w |= intf->needs_remote_wakeup; -+ } -+ } -+ -+ /* If the device is autosuspended with the wrong wakeup setting, -+ * autoresume now so the setting can be changed. -+ */ -+ if (udev->state == USB_STATE_SUSPENDED && w != udev->do_remote_wakeup) -+ pm_runtime_resume(&udev->dev); -+ udev->do_remote_wakeup = w; -+} -+ - /* The device lock is held by the PM core */ - int usb_suspend(struct device *dev, pm_message_t msg) - { - struct usb_device *udev = to_usb_device(dev); - - do_unbind_rebind(udev, DO_UNBIND); -- udev->do_remote_wakeup = device_may_wakeup(&udev->dev); -+ choose_wakeup(udev, msg); - return usb_suspend_both(udev, msg); - } - diff --git a/usb.current/usb-fixed-bug-in-usbsevseg-using-usb-autosuspend-incorrectly.patch b/usb.current/usb-fixed-bug-in-usbsevseg-using-usb-autosuspend-incorrectly.patch deleted file mode 100644 index 97499ed946ffb0..00000000000000 --- a/usb.current/usb-fixed-bug-in-usbsevseg-using-usb-autosuspend-incorrectly.patch +++ /dev/null @@ -1,70 +0,0 @@ -From harrisonmetz@gmail.com Wed Apr 14 11:14:23 2010 -From: Harrison Metzger <harrisonmetz@gmail.com> -Date: Tue, 09 Mar 2010 15:12:10 -0500 -Subject: USB: fixed bug in usbsevseg using USB autosuspend incorrectly -To: Greg KH <greg@kroah.com> -Cc: Oliver Neukum <oliver@neukum.org> -Message-ID: <4B96AB9A.9070900@gmail.com> - - -This patch fixes a bug with the usbsevseg driver which assumed that USB -autosuspend will always be used. - -Signed-off-by: Harrison Metzger <harrisonmetz@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/misc/usbsevseg.c | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - ---- a/drivers/usb/misc/usbsevseg.c -+++ b/drivers/usb/misc/usbsevseg.c -@@ -49,6 +49,7 @@ struct usb_sevsegdev { - u16 textlength; - - u8 shadow_power; /* for PM */ -+ u8 has_interface_pm; - }; - - /* sysfs_streq can't replace this completely -@@ -68,12 +69,16 @@ static void update_display_powered(struc - { - int rc; - -- if (!mydev->shadow_power && mydev->powered) { -+ if (mydev->powered && !mydev->has_interface_pm) { - rc = usb_autopm_get_interface(mydev->intf); - if (rc < 0) - return; -+ mydev->has_interface_pm = 1; - } - -+ if (mydev->shadow_power != 1) -+ return; -+ - rc = usb_control_msg(mydev->udev, - usb_sndctrlpipe(mydev->udev, 0), - 0x12, -@@ -86,8 +91,10 @@ static void update_display_powered(struc - if (rc < 0) - dev_dbg(&mydev->udev->dev, "power retval = %d\n", rc); - -- if (mydev->shadow_power && !mydev->powered) -+ if (!mydev->powered && mydev->has_interface_pm) { - usb_autopm_put_interface(mydev->intf); -+ mydev->has_interface_pm = 0; -+ } - } - - static void update_display_mode(struct usb_sevsegdev *mydev) -@@ -351,6 +358,10 @@ static int sevseg_probe(struct usb_inter - mydev->intf = interface; - usb_set_intfdata(interface, mydev); - -+ /* PM */ -+ mydev->shadow_power = 1; /* currently active */ -+ mydev->has_interface_pm = 0; /* have not issued autopm_get */ -+ - /*set defaults */ - mydev->textmode = 0x02; /* ascii mode */ - mydev->mode_msb = 0x06; /* 6 characters */ diff --git a/usb.current/usb-increase-timeout-value-for-device-reset.patch b/usb.current/usb-increase-timeout-value-for-device-reset.patch deleted file mode 100644 index a4b13df2d59dfb..00000000000000 --- a/usb.current/usb-increase-timeout-value-for-device-reset.patch +++ /dev/null @@ -1,33 +0,0 @@ -From Dinh.Nguyen@freescale.com Wed Apr 14 11:31:18 2010 -From: Dinh.Nguyen@freescale.com -Date: Tue, 13 Apr 2010 11:13:15 -0500 -Subject: usb: Increase timeout value for device reset -To: linux-usb@vger.kernel.org -Cc: dbrownell@users.sourceforge.net, amit.kucheria@canonical.com, Dinh Nguyen <Dinh.Nguyen@freescale.com> -Message-ID: <1271175195-3664-1-git-send-email-Dinh.Nguyen@freescale.com> - - -From: Dinh Nguyen <Dinh.Nguyen@freescale.com> - -It seems that for USB IP on Freescale MX5x processors, it needs >750 -usec for the reset to complete. This change should not hurt any other -EHCI hardware. - -Signed-off-by: Dinh Nguyen <Dinh.Nguyen@freescale.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-hub.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/host/ehci-hub.c -+++ b/drivers/usb/host/ehci-hub.c -@@ -801,7 +801,7 @@ static int ehci_hub_control ( - * this bit; seems too long to spin routinely... - */ - retval = handshake(ehci, status_reg, -- PORT_RESET, 0, 750); -+ PORT_RESET, 0, 1000); - if (retval != 0) { - ehci_err (ehci, "port %d reset error %d\n", - wIndex + 1, retval); diff --git a/usb.current/usb-ohci-da8xx-omap-l1x-fix-up-macro-rename.patch b/usb.current/usb-ohci-da8xx-omap-l1x-fix-up-macro-rename.patch deleted file mode 100644 index 6cecd37594ba4d..00000000000000 --- a/usb.current/usb-ohci-da8xx-omap-l1x-fix-up-macro-rename.patch +++ /dev/null @@ -1,32 +0,0 @@ -From sshtylyov@ru.mvista.com Wed Apr 14 11:23:08 2010 -From: Sergei Shtylyov <sshtylyov@ru.mvista.com> -Date: Fri, 26 Mar 2010 17:37:14 +0300 -Subject: USB: OHCI: DA8xx/OMAP-L1x: fix up macro rename -To: linux-usb@vger.kernel.org, gregkh@suse.de -Cc: davinci-linux-open-source@linux.davincidsp.com -Message-ID: <201003261737.14643.sshtylyov@ru.mvista.com> - - -It appears that the DA8xx/OMAP-L1x glue layer went into the kernel uncompilable: -commit 1960e693ac12ae5fe518309d6a63a44c93fad9e7 (davinci: da8xx/omapl1: add -support for the second sysconfig module) has renamed DA8XX_SYSCFG_* macros to -DA8XX_SYSCFG0_* and it's been committed before the glue layer... - -Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ohci-da8xx.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/host/ohci-da8xx.c -+++ b/drivers/usb/host/ohci-da8xx.c -@@ -23,7 +23,7 @@ - #error "This file is DA8xx bus glue. Define CONFIG_ARCH_DAVINCI_DA8XX." - #endif - --#define CFGCHIP2 DA8XX_SYSCFG_VIRT(DA8XX_CFGCHIP2_REG) -+#define CFGCHIP2 DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG) - - static struct clk *usb11_clk; - static struct clk *usb20_clk; diff --git a/usb.current/usb-pl2303-add-adlink-nd-6530-usb-ids.patch b/usb.current/usb-pl2303-add-adlink-nd-6530-usb-ids.patch deleted file mode 100644 index 0d9f5e002f6f5a..00000000000000 --- a/usb.current/usb-pl2303-add-adlink-nd-6530-usb-ids.patch +++ /dev/null @@ -1,40 +0,0 @@ -From manuel.jander@gmail.com Wed Apr 14 11:24:17 2010 -From: Manuel Jander <manuel.jander@gmail.com> -Date: Mon, 29 Mar 2010 23:51:57 +0200 -Subject: USB: pl2303: add AdLink ND-6530 USB IDs -To: Greg KH <greg@kroah.com> -Message-ID: <21ed1c371003291451p11a8029wbe8631c11708f3d5@mail.gmail.com> - - -I read a rumor that the AdLink ND6530 USB RS232, RS422 and RS485 -isolated adapter is actually a PL2303 based usb serial adapter. I -tried it out, and as far as I can tell it works. - -Signed-off-by: Manuel Jander <manuel.jander@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/pl2303.c | 1 + - drivers/usb/serial/pl2303.h | 4 ++++ - 2 files changed, 5 insertions(+) - ---- a/drivers/usb/serial/pl2303.c -+++ b/drivers/usb/serial/pl2303.c -@@ -97,6 +97,7 @@ static const struct usb_device_id id_tab - { USB_DEVICE(CRESSI_VENDOR_ID, CRESSI_EDY_PRODUCT_ID) }, - { USB_DEVICE(SONY_VENDOR_ID, SONY_QN3USB_PRODUCT_ID) }, - { USB_DEVICE(SANWA_VENDOR_ID, SANWA_PRODUCT_ID) }, -+ { USB_DEVICE(ADLINK_VENDOR_ID, ADLINK_ND6530_PRODUCT_ID) }, - { } /* Terminating entry */ - }; - ---- a/drivers/usb/serial/pl2303.h -+++ b/drivers/usb/serial/pl2303.h -@@ -134,3 +134,7 @@ - /* Sanwa KB-USB2 multimeter cable (ID: 11ad:0001) */ - #define SANWA_VENDOR_ID 0x11ad - #define SANWA_PRODUCT_ID 0x0001 -+ -+/* ADLINK ND-6530 RS232,RS485 and RS422 adapter */ -+#define ADLINK_VENDOR_ID 0x0b63 -+#define ADLINK_ND6530_PRODUCT_ID 0x6530 diff --git a/usb.current/usb-put-claimed-interfaces-in-the-suspended-state.patch b/usb.current/usb-put-claimed-interfaces-in-the-suspended-state.patch deleted file mode 100644 index 2fcb6894d270fb..00000000000000 --- a/usb.current/usb-put-claimed-interfaces-in-the-suspended-state.patch +++ /dev/null @@ -1,86 +0,0 @@ -From stern@rowland.harvard.edu Wed Apr 14 11:30:24 2010 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Fri, 9 Apr 2010 16:03:43 -0400 (EDT) -Subject: USB: put claimed interfaces in the "suspended" state -To: Greg KH <greg@kroah.com> -Cc: Dominik Brodowski <linux@dominikbrodowski.net> -Message-ID: <Pine.LNX.4.44L0.1004091601030.1852-100000@iolanthe.rowland.org> - - -This patch (as1370) fixes a bug in the USB runtime power management -code. When a driver claims an interface, it doesn't expect to need to -call usb_autopm_get_interface() or usb_autopm_put_interface() for -runtime PM to work. Runtime PM can be controlled by the driver's -primary interface; the additional interfaces it claims shouldn't -interfere. As things stand, the claimed interfaces will prevent the -device from autosuspending. - -To fix this problem, the patch sets interfaces to the suspended state -when they are claimed. - -Also, although in theory this shouldn't matter, the patch changes the -suspend code so that interfaces are suspended in reverse order from -detection and resuming. This is how the PM core works, and we ought -to use the same approach. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Debugged-and-tested-by: Dominik Brodowski <linux@dominikbrodowski.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/core/driver.c | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) - ---- a/drivers/usb/core/driver.c -+++ b/drivers/usb/core/driver.c -@@ -301,7 +301,7 @@ static int usb_probe_interface(struct de - - intf->condition = USB_INTERFACE_BINDING; - -- /* Bound interfaces are initially active. They are -+ /* Probed interfaces are initially active. They are - * runtime-PM-enabled only if the driver has autosuspend support. - * They are sensitive to their children's power states. - */ -@@ -437,11 +437,11 @@ int usb_driver_claim_interface(struct us - - iface->condition = USB_INTERFACE_BOUND; - -- /* Bound interfaces are initially active. They are -+ /* Claimed interfaces are initially inactive (suspended). They are - * runtime-PM-enabled only if the driver has autosuspend support. - * They are sensitive to their children's power states. - */ -- pm_runtime_set_active(dev); -+ pm_runtime_set_suspended(dev); - pm_suspend_ignore_children(dev, false); - if (driver->supports_autosuspend) - pm_runtime_enable(dev); -@@ -1170,7 +1170,7 @@ done: - static int usb_suspend_both(struct usb_device *udev, pm_message_t msg) - { - int status = 0; -- int i = 0; -+ int i = 0, n = 0; - struct usb_interface *intf; - - if (udev->state == USB_STATE_NOTATTACHED || -@@ -1179,7 +1179,8 @@ static int usb_suspend_both(struct usb_d - - /* Suspend all the interfaces and then udev itself */ - if (udev->actconfig) { -- for (; i < udev->actconfig->desc.bNumInterfaces; i++) { -+ n = udev->actconfig->desc.bNumInterfaces; -+ for (i = n - 1; i >= 0; --i) { - intf = udev->actconfig->interface[i]; - status = usb_suspend_interface(udev, intf, msg); - if (status != 0) -@@ -1192,7 +1193,7 @@ static int usb_suspend_both(struct usb_d - /* If the suspend failed, resume interfaces that did get suspended */ - if (status != 0) { - msg.event ^= (PM_EVENT_SUSPEND | PM_EVENT_RESUME); -- while (--i >= 0) { -+ while (++i < n) { - intf = udev->actconfig->interface[i]; - usb_resume_interface(udev, intf, msg, 0); - } diff --git a/usb.current/usb-qcaux-add-lg-rumor-and-sanyo-katana-lx-device-ids.patch b/usb.current/usb-qcaux-add-lg-rumor-and-sanyo-katana-lx-device-ids.patch deleted file mode 100644 index f90394f085c4d8..00000000000000 --- a/usb.current/usb-qcaux-add-lg-rumor-and-sanyo-katana-lx-device-ids.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dcbw@redhat.com Wed Apr 14 11:21:37 2010 -From: Dan Williams <dcbw@redhat.com> -Date: Tue, 23 Mar 2010 03:08:48 -0700 -Subject: USB: qcaux: add LG Rumor and Sanyo Katana LX device IDs -To: Greg KH <greg@kroah.com> -Cc: linux-usb@vger.kernel.org -Message-ID: <1269338928.20540.6.camel@localhost.localdomain> - - -These phones also have the familiar ttyACM0/ttyUSB0 schizophrenia when -placed into "Dial-up Networking" mode after connecting a USB cable. - -Signed-off-by: Dan Williams <dcbw@redhat.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/qcaux.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - ---- a/drivers/usb/serial/qcaux.c -+++ b/drivers/usb/serial/qcaux.c -@@ -42,6 +42,14 @@ - #define CMOTECH_PRODUCT_CDU550 0x5553 - #define CMOTECH_PRODUCT_CDX650 0x6512 - -+/* LG devices */ -+#define LG_VENDOR_ID 0x1004 -+#define LG_PRODUCT_VX4400_6000 0x6000 /* VX4400/VX6000/Rumor */ -+ -+/* Sanyo devices */ -+#define SANYO_VENDOR_ID 0x0474 -+#define SANYO_PRODUCT_KATANA_LX 0x0754 /* SCP-3800 (Katana LX) */ -+ - static struct usb_device_id id_table[] = { - { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, UTSTARCOM_PRODUCT_PC5740, 0xff, 0x00, 0x00) }, - { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, UTSTARCOM_PRODUCT_PC5750, 0xff, 0x00, 0x00) }, -@@ -51,6 +59,8 @@ static struct usb_device_id id_table[] = - { USB_DEVICE_AND_INTERFACE_INFO(UTSTARCOM_VENDOR_ID, UTSTARCOM_PRODUCT_UM175_ALLTEL, 0xff, 0x00, 0x00) }, - { USB_DEVICE_AND_INTERFACE_INFO(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CDU550, 0xff, 0xff, 0x00) }, - { USB_DEVICE_AND_INTERFACE_INFO(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CDX650, 0xff, 0xff, 0x00) }, -+ { USB_DEVICE_AND_INTERFACE_INFO(LG_VENDOR_ID, LG_PRODUCT_VX4400_6000, 0xff, 0xff, 0x00) }, -+ { USB_DEVICE_AND_INTERFACE_INFO(SANYO_VENDOR_ID, SANYO_PRODUCT_KATANA_LX, 0xff, 0xff, 0x00) }, - { }, - }; - MODULE_DEVICE_TABLE(usb, id_table); diff --git a/usb.current/usb-ti_usb_3410_5052-adding-multitech-dialup-fax-modem-devices.patch b/usb.current/usb-ti_usb_3410_5052-adding-multitech-dialup-fax-modem-devices.patch deleted file mode 100644 index 9f9e58417e427b..00000000000000 --- a/usb.current/usb-ti_usb_3410_5052-adding-multitech-dialup-fax-modem-devices.patch +++ /dev/null @@ -1,119 +0,0 @@ -Subject: USB: ti_usb_3410_5052: adding multitech dialup fax/modem devices -From: Alex Manoussakis <alex@juniper.net> - -The following patch adds support for Multitech Systems' MT9234MU and -MT9234ZBA usb dialup fax modems. It is based on a patch and firmware -provided to me by Multitech Systems' support, after I reported to them -that my MT9234MU modem was not working with recent linux kernels. - -Signed-off-by: Alex Manoussakis <alex@juniper.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/ti_usb_3410_5052.c | 26 ++++++++++++++++++++++---- - drivers/usb/serial/ti_usb_3410_5052.h | 3 +++ - 2 files changed, 25 insertions(+), 4 deletions(-) - ---- a/drivers/usb/serial/ti_usb_3410_5052.c -+++ b/drivers/usb/serial/ti_usb_3410_5052.c -@@ -172,7 +172,7 @@ static unsigned int product_5052_count; - /* the array dimension is the number of default entries plus */ - /* TI_EXTRA_VID_PID_COUNT user defined entries plus 1 terminating */ - /* null entry */ --static struct usb_device_id ti_id_table_3410[10+TI_EXTRA_VID_PID_COUNT+1] = { -+static struct usb_device_id ti_id_table_3410[13+TI_EXTRA_VID_PID_COUNT+1] = { - { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) }, - { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) }, - { USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) }, -@@ -180,6 +180,9 @@ static struct usb_device_id ti_id_table_ - { USB_DEVICE(MTS_VENDOR_ID, MTS_CDMA_PRODUCT_ID) }, - { USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_PRODUCT_ID) }, - { USB_DEVICE(MTS_VENDOR_ID, MTS_EDGE_PRODUCT_ID) }, -+ { USB_DEVICE(MTS_VENDOR_ID, MTS_MT9234MU_PRODUCT_ID) }, -+ { USB_DEVICE(MTS_VENDOR_ID, MTS_MT9234ZBA_PRODUCT_ID) }, -+ { USB_DEVICE(MTS_VENDOR_ID, MTS_MT9234ZBAOLD_PRODUCT_ID) }, - { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) }, - { USB_DEVICE(IBM_VENDOR_ID, IBM_454B_PRODUCT_ID) }, - { USB_DEVICE(IBM_VENDOR_ID, IBM_454C_PRODUCT_ID) }, -@@ -192,7 +195,7 @@ static struct usb_device_id ti_id_table_ - { USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) }, - }; - --static struct usb_device_id ti_id_table_combined[14+2*TI_EXTRA_VID_PID_COUNT+1] = { -+static struct usb_device_id ti_id_table_combined[17+2*TI_EXTRA_VID_PID_COUNT+1] = { - { USB_DEVICE(TI_VENDOR_ID, TI_3410_PRODUCT_ID) }, - { USB_DEVICE(TI_VENDOR_ID, TI_3410_EZ430_ID) }, - { USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_NO_FW_PRODUCT_ID) }, -@@ -200,6 +203,9 @@ static struct usb_device_id ti_id_table_ - { USB_DEVICE(MTS_VENDOR_ID, MTS_CDMA_PRODUCT_ID) }, - { USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_PRODUCT_ID) }, - { USB_DEVICE(MTS_VENDOR_ID, MTS_EDGE_PRODUCT_ID) }, -+ { USB_DEVICE(MTS_VENDOR_ID, MTS_MT9234MU_PRODUCT_ID) }, -+ { USB_DEVICE(MTS_VENDOR_ID, MTS_MT9234ZBA_PRODUCT_ID) }, -+ { USB_DEVICE(MTS_VENDOR_ID, MTS_MT9234ZBAOLD_PRODUCT_ID) }, - { USB_DEVICE(TI_VENDOR_ID, TI_5052_BOOT_PRODUCT_ID) }, - { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) }, - { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) }, -@@ -287,6 +293,8 @@ MODULE_FIRMWARE("ti_5052.fw"); - MODULE_FIRMWARE("mts_cdma.fw"); - MODULE_FIRMWARE("mts_gsm.fw"); - MODULE_FIRMWARE("mts_edge.fw"); -+MODULE_FIRMWARE("mts_mt9234mu.fw"); -+MODULE_FIRMWARE("mts_mt9234zba.fw"); - - module_param(debug, bool, S_IRUGO | S_IWUSR); - MODULE_PARM_DESC(debug, "Enable debugging, 0=no, 1=yes"); -@@ -1687,6 +1695,7 @@ static int ti_download_firmware(struct t - const struct firmware *fw_p; - char buf[32]; - -+ dbg("%s\n", __func__); - /* try ID specific firmware first, then try generic firmware */ - sprintf(buf, "ti_usb-v%04x-p%04x.fw", dev->descriptor.idVendor, - dev->descriptor.idProduct); -@@ -1703,7 +1712,15 @@ static int ti_download_firmware(struct t - case MTS_EDGE_PRODUCT_ID: - strcpy(buf, "mts_edge.fw"); - break; -- } -+ case MTS_MT9234MU_PRODUCT_ID: -+ strcpy(buf, "mts_mt9234mu.fw"); -+ break; -+ case MTS_MT9234ZBA_PRODUCT_ID: -+ strcpy(buf, "mts_mt9234zba.fw"); -+ break; -+ case MTS_MT9234ZBAOLD_PRODUCT_ID: -+ strcpy(buf, "mts_mt9234zba.fw"); -+ break; } - } - if (buf[0] == '\0') { - if (tdev->td_is_3410) -@@ -1718,7 +1735,7 @@ static int ti_download_firmware(struct t - return -ENOENT; - } - if (fw_p->size > TI_FIRMWARE_BUF_SIZE) { -- dev_err(&dev->dev, "%s - firmware too large\n", __func__); -+ dev_err(&dev->dev, "%s - firmware too large %d \n", __func__, fw_p->size); - return -ENOENT; - } - -@@ -1730,6 +1747,7 @@ static int ti_download_firmware(struct t - status = ti_do_download(dev, pipe, buffer, fw_p->size); - kfree(buffer); - } else { -+ dbg("%s ENOMEM\n", __func__); - status = -ENOMEM; - } - release_firmware(fw_p); ---- a/drivers/usb/serial/ti_usb_3410_5052.h -+++ b/drivers/usb/serial/ti_usb_3410_5052.h -@@ -45,6 +45,9 @@ - #define MTS_CDMA_PRODUCT_ID 0xF110 - #define MTS_GSM_PRODUCT_ID 0xF111 - #define MTS_EDGE_PRODUCT_ID 0xF112 -+#define MTS_MT9234MU_PRODUCT_ID 0xF114 -+#define MTS_MT9234ZBA_PRODUCT_ID 0xF115 -+#define MTS_MT9234ZBAOLD_PRODUCT_ID 0x0319 - - /* Commands */ - #define TI_GET_VERSION 0x01 diff --git a/usb.current/usb-wusb-don-t-overflow-the-keep-alive-ie-buffer.patch b/usb.current/usb-wusb-don-t-overflow-the-keep-alive-ie-buffer.patch deleted file mode 100644 index 6e1f066a7e2421..00000000000000 --- a/usb.current/usb-wusb-don-t-overflow-the-keep-alive-ie-buffer.patch +++ /dev/null @@ -1,29 +0,0 @@ -From david.vrabel@csr.com Wed Apr 14 11:20:42 2010 -From: David Vrabel <david.vrabel@csr.com> -Date: Mon, 22 Mar 2010 14:50:14 +0000 -Subject: usb: wusb: don't overflow the Keep Alive IE buffer -To: Greg KH <gregkh@suse.de> -Cc: linux-usb@vger.kernel.org, David Vrabel <david.vrabel@csr.com> -Message-ID: <1269269414-5826-1-git-send-email-david.vrabel@csr.com> - - -The Keep Alive IE only has space for WUIE_ELT_MAX (== 4) device addresses. - -Signed-off-by: David Vrabel <david.vrabel@csr.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/wusbcore/devconnect.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/wusbcore/devconnect.c -+++ b/drivers/usb/wusbcore/devconnect.c -@@ -438,7 +438,7 @@ static void __wusbhc_keep_alive(struct w - old_keep_alives = ie->hdr.bLength - sizeof(ie->hdr); - keep_alives = 0; - for (cnt = 0; -- keep_alives <= WUIE_ELT_MAX && cnt < wusbhc->ports_max; -+ keep_alives < WUIE_ELT_MAX && cnt < wusbhc->ports_max; - cnt++) { - unsigned tt = msecs_to_jiffies(wusbhc->trust_timeout); - diff --git a/usb/usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch b/usb/usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch index e9880350237e6e..1d706620675df9 100644 --- a/usb/usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch +++ b/usb/usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch @@ -1081,7 +1081,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> atomic_dec(&dev->active_tx_urbs); --- a/drivers/net/usb/kaweth.c +++ b/drivers/net/usb/kaweth.c -@@ -1155,13 +1155,13 @@ err_fw: +@@ -1156,13 +1156,13 @@ err_fw: if (!kaweth->irq_urb) goto err_tx_and_rx; @@ -1097,7 +1097,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> KAWETH_BUF_SIZE, GFP_KERNEL, &kaweth->rxbufferhandle); -@@ -1202,9 +1202,9 @@ err_fw: +@@ -1203,9 +1203,9 @@ err_fw: err_intfdata: usb_set_intfdata(intf, NULL); @@ -1109,7 +1109,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> err_tx_and_rx_and_irq: usb_free_urb(kaweth->irq_urb); err_tx_and_rx: -@@ -1241,8 +1241,8 @@ static void kaweth_disconnect(struct usb +@@ -1242,8 +1242,8 @@ static void kaweth_disconnect(struct usb usb_free_urb(kaweth->tx_urb); usb_free_urb(kaweth->irq_urb); @@ -1 +1 @@ -2.6.34-rc5 +2.6.34-rc6 |