diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-11-30 14:54:20 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-11-30 14:54:20 -0800 |
| commit | 09785355a29fc1316655725a3c4a2638e44330b6 (patch) | |
| tree | c6a8c76e3ef485d63d92c797bdb05f4b9542573d | |
| parent | b88a5d79af4ecc5c3f4667548c98dcc059c0edab (diff) | |
| download | patches-09785355a29fc1316655725a3c4a2638e44330b6.tar.gz | |
more bugfixes
14 files changed, 328 insertions, 15 deletions
@@ -15,6 +15,7 @@ gregkh/gkh-version.patch ################################# tty.current/tty_port-handle-the-nonblocking-open-of-a-dead-port-corner-case.patch tty.current/bcm63xx_uart-fix-serial-driver-compile-breakage.patch +tty.current/tty-of_serial-add-missing-ns16550a-id.patch ################################# # USB patches for 2.6.32 @@ -27,12 +28,15 @@ usb.current/usb-musb-remove-unwanted-message-in-boot-log.patch usb.current/usb-musb-fix-isoc-tx-programming-for-cppi-dmas.patch usb.current/usb-musb-respect-usb_request-zero-in-control-requests.patch usb.current/usb-musb-fix-cppi-irqs-not-being-signaled.patch +usb.current/usb-work-around-for-ehci-with-quirky-periodic-schedules.patch +usb.current/usb-add-support-for-mobilcom-debitel-usb-umts-surf-stick-to-option-driver.patch ################################# # Staging patches for 2.6.32 ################################# staging.current/staging-hv-fix-argument-order-in-incorrect-memset-invocations-in-hyperv-driver.patch staging.current/staging-hv-fix-vmbus-event-handler-bug.patch +staging.current/staging-hv-fix-some-missing-author-names.patch staging.current/staging-update-todo-files.patch @@ -202,6 +206,7 @@ usb/usb-musb_gadget_ep0-stop-abusing-musb_gadget_set_halt.patch usb/usb-musb_gadget-remove-pointless-loop.patch usb/usb-usbtmc-repeat-usb_bulk_msg-until-whole-message-is-transfered.patch usb/usb-twl4030-enable-usb-regulators-before-enabling-usb-charging.patch +usb/usb-add-devpath-sysfs-attribute.patch ################################# @@ -470,4 +475,3 @@ staging/staging-batman-adv-meshing-protocol.patch #tty.work/serial-f81216-helper -usb-add-devpath-sysfs-attribute.patch diff --git a/staging.current/staging-hv-fix-some-missing-author-names.patch b/staging.current/staging-hv-fix-some-missing-author-names.patch new file mode 100644 index 00000000000000..a2aa7c96ca96d1 --- /dev/null +++ b/staging.current/staging-hv-fix-some-missing-author-names.patch @@ -0,0 +1,76 @@ +From haiyangz@microsoft.com Mon Nov 30 14:38:00 2009 +From: Haiyang Zhang <haiyangz@microsoft.com> +Date: Mon, 23 Nov 2009 17:00:22 +0000 +Subject: Staging: hv: Fix some missing author names +To: "'gregkh@suse.de'" <gregkh@suse.de>, Hank Janssen <hjanssen@microsoft.com> +Message-ID: <1FB5E1D5CA062146B38059374562DF7230C8352F@TK5EX14MBXC126.redmond.corp.microsoft.com> + + +From: Haiyang Zhang <haiyangz@microsoft.com> + +Fix some missing author names. +They were accidentally removed by someone within Microsoft before the +files were sent for inclusion in the kernel. + +Signed-off-by: Hank Janssen <hjanssen@microsoft.com> +Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/hv/BlkVsc.c | 1 + + drivers/staging/hv/NetVsc.c | 1 + + drivers/staging/hv/NetVsc.h | 1 + + drivers/staging/hv/blkvsc_drv.c | 1 + + drivers/staging/hv/netvsc_drv.c | 1 + + 5 files changed, 5 insertions(+) + +--- a/drivers/staging/hv/BlkVsc.c ++++ b/drivers/staging/hv/BlkVsc.c +@@ -16,6 +16,7 @@ + * Place - Suite 330, Boston, MA 02111-1307 USA. + * + * Authors: ++ * Haiyang Zhang <haiyangz@microsoft.com> + * Hank Janssen <hjanssen@microsoft.com> + * + */ +--- a/drivers/staging/hv/blkvsc_drv.c ++++ b/drivers/staging/hv/blkvsc_drv.c +@@ -15,6 +15,7 @@ + * Place - Suite 330, Boston, MA 02111-1307 USA. + * + * Authors: ++ * Haiyang Zhang <haiyangz@microsoft.com> + * Hank Janssen <hjanssen@microsoft.com> + */ + #include <linux/init.h> +--- a/drivers/staging/hv/NetVsc.c ++++ b/drivers/staging/hv/NetVsc.c +@@ -15,6 +15,7 @@ + * Place - Suite 330, Boston, MA 02111-1307 USA. + * + * Authors: ++ * Haiyang Zhang <haiyangz@microsoft.com> + * Hank Janssen <hjanssen@microsoft.com> + */ + #include <linux/kernel.h> +--- a/drivers/staging/hv/netvsc_drv.c ++++ b/drivers/staging/hv/netvsc_drv.c +@@ -15,6 +15,7 @@ + * Place - Suite 330, Boston, MA 02111-1307 USA. + * + * Authors: ++ * Haiyang Zhang <haiyangz@microsoft.com> + * Hank Janssen <hjanssen@microsoft.com> + */ + #include <linux/init.h> +--- a/drivers/staging/hv/NetVsc.h ++++ b/drivers/staging/hv/NetVsc.h +@@ -16,6 +16,7 @@ + * Place - Suite 330, Boston, MA 02111-1307 USA. + * + * Authors: ++ * Haiyang Zhang <haiyangz@microsoft.com> + * Hank Janssen <hjanssen@microsoft.com> + * + */ diff --git a/tty.current/tty-of_serial-add-missing-ns16550a-id.patch b/tty.current/tty-of_serial-add-missing-ns16550a-id.patch new file mode 100644 index 00000000000000..e36be32aa7da97 --- /dev/null +++ b/tty.current/tty-of_serial-add-missing-ns16550a-id.patch @@ -0,0 +1,35 @@ +From arnd@arndb.de Mon Nov 30 14:37:06 2009 +From: Michal Simek <monstr@monstr.eu> +Date: Tue, 24 Nov 2009 10:22:41 +0000 +Subject: tty/of_serial: add missing ns16550a id +To: greg@kroah.com, devicetree-discuss@lists.ozlabs.org +Cc: grant.likely@secretlab.ca, john.williams@petalogix.com, Stephen Neuendorffer <stephen.neuendorffer@xilinx.com> +Message-ID: <200911241022.41078.arnd@arndb.de> + + +From: Michal Simek <monstr@monstr.eu> + +Many boards have a bug-free ns16550 compatible serial port, which we should +register as PORT_16550A. This introduces a new value "ns16550a" for the +compatible property of of_serial to let a firmware choose that model instead +of using the crippled PORT_16550 mode. + +Reported-by: Alon Ziv <alonz@nolaviz.org> +Signed-off-by: Michal Simek <monstr@monstr.eu> +Signed-off-by: Arnd Bergmann <arnd@arndb.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/serial/of_serial.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/serial/of_serial.c ++++ b/drivers/serial/of_serial.c +@@ -161,6 +161,7 @@ static int of_platform_serial_remove(str + static struct of_device_id __devinitdata of_platform_serial_table[] = { + { .type = "serial", .compatible = "ns8250", .data = (void *)PORT_8250, }, + { .type = "serial", .compatible = "ns16450", .data = (void *)PORT_16450, }, ++ { .type = "serial", .compatible = "ns16550a", .data = (void *)PORT_16550A, }, + { .type = "serial", .compatible = "ns16550", .data = (void *)PORT_16550, }, + { .type = "serial", .compatible = "ns16750", .data = (void *)PORT_16750, }, + { .type = "serial", .compatible = "ns16850", .data = (void *)PORT_16850, }, diff --git a/usb.current/usb-add-support-for-mobilcom-debitel-usb-umts-surf-stick-to-option-driver.patch b/usb.current/usb-add-support-for-mobilcom-debitel-usb-umts-surf-stick-to-option-driver.patch new file mode 100644 index 00000000000000..2193c1f49663a7 --- /dev/null +++ b/usb.current/usb-add-support-for-mobilcom-debitel-usb-umts-surf-stick-to-option-driver.patch @@ -0,0 +1,45 @@ +From gernot@hillier.de Mon Nov 30 14:39:47 2009 +From: Gernot Hillier <gernot@hillier.de> +Date: Fri, 27 Nov 2009 13:49:23 +0100 +Subject: USB: Add support for Mobilcom Debitel USB UMTS Surf-Stick to option driver +To: Oliver Neukum <oliver@neukum.org> +Cc: Matthias Urlichs <smurf@smurf.noris.de>, Greg Kroah-Hartman <gregkh@suse.de> +Message-ID: <4B0FCAD3.9000801@hillier.de> + +From: Gernot Hillier <gernot@hillier.de> + +This patch adds the vendor and device id for the Mobilcom Debitel UMTS surf +stick (a.k.a. 4G Systems XSStick W14, MobiData MBD-200HU, ...). + +To see these ids, you need to switch the stick to modem operation first +with the help of usb_modeswitch. This makes it switch from 1c9e:f000 to +1c9e:9603 and thus be recognized by the option driver. + +Signed-off-by: Gernot Hillier <gernot@hillier.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/option.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -336,6 +336,10 @@ static int option_resume(struct usb_ser + #define AIRPLUS_VENDOR_ID 0x1011 + #define AIRPLUS_PRODUCT_MCD650 0x3198 + ++/* 4G Systems products */ ++#define FOUR_G_SYSTEMS_VENDOR_ID 0x1c9e ++#define FOUR_G_SYSTEMS_PRODUCT_W14 0x9603 ++ + static struct usb_device_id option_ids[] = { + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, +@@ -599,6 +603,7 @@ static struct usb_device_id option_ids[] + { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) }, + { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) }, + { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) }, ++ { USB_DEVICE(FOUR_G_SYSTEMS_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14) }, + { } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(usb, option_ids); diff --git a/usb.current/usb-work-around-for-ehci-with-quirky-periodic-schedules.patch b/usb.current/usb-work-around-for-ehci-with-quirky-periodic-schedules.patch new file mode 100644 index 00000000000000..9be1ebc1849c01 --- /dev/null +++ b/usb.current/usb-work-around-for-ehci-with-quirky-periodic-schedules.patch @@ -0,0 +1,101 @@ +From oliver@neukum.org Mon Nov 30 14:34:55 2009 +From: Oliver Neukum <oliver@neukum.org> +Date: Fri, 27 Nov 2009 15:17:59 +0100 +Subject: USB: work around for EHCI with quirky periodic schedules +To: "Greg Kroah-Hartman" <gregkh@suse.de>, Sarah Sharp <sarah.a.sharp@linux.intel.com>, Stephan Diestelhorst <stephan.diestelhorst@gmail.com>, Alan Stern <stern@rowland.harvard.edu> +Message-ID: <200911271517.59867.oliver@neukum.org> + + +a quirky chipset needs periodic schedules to run for a minimum +time before they can be disabled again. This enforces the requirement +with a time stamp and a calculated delay + +Signed-off-by: Oliver Neukum <oliver@neukum.org> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + + +--- + drivers/usb/host/ehci-hcd.c | 2 ++ + drivers/usb/host/ehci-pci.c | 4 ++++ + drivers/usb/host/ehci-sched.c | 12 ++++++++++++ + drivers/usb/host/ehci.h | 2 ++ + 4 files changed, 20 insertions(+) + +--- a/drivers/usb/host/ehci.h ++++ b/drivers/usb/host/ehci.h +@@ -118,6 +118,7 @@ struct ehci_hcd { /* one per controlle + unsigned stamp; + unsigned random_frame; + unsigned long next_statechange; ++ ktime_t last_periodic_enable; + u32 command; + + /* SILICON QUIRKS */ +@@ -127,6 +128,7 @@ struct ehci_hcd { /* one per controlle + unsigned big_endian_desc:1; + unsigned has_amcc_usb23:1; + unsigned need_io_watchdog:1; ++ unsigned broken_periodic:1; + + /* required for usb32 quirk */ + #define OHCI_CTRL_HCFS (3 << 6) +--- a/drivers/usb/host/ehci-hcd.c ++++ b/drivers/usb/host/ehci-hcd.c +@@ -28,6 +28,7 @@ + #include <linux/errno.h> + #include <linux/init.h> + #include <linux/timer.h> ++#include <linux/ktime.h> + #include <linux/list.h> + #include <linux/interrupt.h> + #include <linux/usb.h> +@@ -676,6 +677,7 @@ static int ehci_run (struct usb_hcd *hcd + ehci_readl(ehci, &ehci->regs->command); /* unblock posted writes */ + msleep(5); + up_write(&ehci_cf_port_reset_rwsem); ++ ehci->last_periodic_enable = ktime_get_real(); + + temp = HC_VERSION(ehci_readl(ehci, &ehci->caps->hc_capbase)); + ehci_info (ehci, +--- a/drivers/usb/host/ehci-pci.c ++++ b/drivers/usb/host/ehci-pci.c +@@ -111,6 +111,10 @@ static int ehci_pci_setup(struct usb_hcd + switch (pdev->vendor) { + case PCI_VENDOR_ID_INTEL: + ehci->need_io_watchdog = 0; ++ if (pdev->device == 0x27cc) { ++ ehci->broken_periodic = 1; ++ ehci_info(ehci, "using broken periodic workaround\n"); ++ } + break; + case PCI_VENDOR_ID_TDI: + if (pdev->device == PCI_DEVICE_ID_TDI_EHCI) { +--- a/drivers/usb/host/ehci-sched.c ++++ b/drivers/usb/host/ehci-sched.c +@@ -475,6 +475,8 @@ static int enable_periodic (struct ehci_ + /* make sure ehci_work scans these */ + ehci->next_uframe = ehci_readl(ehci, &ehci->regs->frame_index) + % (ehci->periodic_size << 3); ++ if (unlikely(ehci->broken_periodic)) ++ ehci->last_periodic_enable = ktime_get_real(); + return 0; + } + +@@ -486,6 +488,16 @@ static int disable_periodic (struct ehci + if (--ehci->periodic_sched) + return 0; + ++ if (unlikely(ehci->broken_periodic)) { ++ /* delay experimentally determined */ ++ ktime_t safe = ktime_add_us(ehci->last_periodic_enable, 1000); ++ ktime_t now = ktime_get_real(); ++ s64 delay = ktime_us_delta(safe, now); ++ ++ if (unlikely(delay > 0)) ++ udelay(delay); ++ } ++ + /* did setting PSE not take effect yet? + * takes effect only at frame boundaries... + */ diff --git a/usb/usb-add-devpath-sysfs-attribute.patch b/usb/usb-add-devpath-sysfs-attribute.patch new file mode 100644 index 00000000000000..f6fdfb032fd7ee --- /dev/null +++ b/usb/usb-add-devpath-sysfs-attribute.patch @@ -0,0 +1,52 @@ +From foo@baz Mon Nov 30 11:15:02 PST 2009 +Date: Mon, 30 Nov 2009 11:15:02 -0800 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: USB: add devpath sysfs attribute + +This is not exported from the usb core, yet we rely on it to create +paths to interfaces for this device in sysfs. Export it to make +userspace tools have an easier time to figure things out. + +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +--- + drivers/usb/core/sysfs.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +--- a/drivers/usb/core/sysfs.c ++++ b/drivers/usb/core/sysfs.c +@@ -139,6 +139,16 @@ show_devnum(struct device *dev, struct d + static DEVICE_ATTR(devnum, S_IRUGO, show_devnum, NULL); + + static ssize_t ++show_devpath(struct device *dev, struct device_attribute *attr, char *buf) ++{ ++ struct usb_device *udev; ++ ++ udev = to_usb_device(dev); ++ return sprintf(buf, "%s\n", udev->devpath); ++} ++static DEVICE_ATTR(devpath, S_IRUGO, show_devpath, NULL); ++ ++static ssize_t + show_version(struct device *dev, struct device_attribute *attr, char *buf) + { + struct usb_device *udev; +@@ -538,8 +548,8 @@ static struct attribute *dev_attrs[] = { + &dev_attr_bConfigurationValue.attr, + &dev_attr_bmAttributes.attr, + &dev_attr_bMaxPower.attr, +- &dev_attr_urbnum.attr, + /* device attributes */ ++ &dev_attr_urbnum.attr, + &dev_attr_idVendor.attr, + &dev_attr_idProduct.attr, + &dev_attr_bcdDevice.attr, +@@ -551,6 +561,7 @@ static struct attribute *dev_attrs[] = { + &dev_attr_speed.attr, + &dev_attr_busnum.attr, + &dev_attr_devnum.attr, ++ &dev_attr_devpath.attr, + &dev_attr_version.attr, + &dev_attr_maxchild.attr, + &dev_attr_quirks.attr, diff --git a/usb/usb-add-ehci-support-for-mx27-and-mx31-based-boards.patch b/usb/usb-add-ehci-support-for-mx27-and-mx31-based-boards.patch index 9745ed3d8db249..50b4e648bb7327 100644 --- a/usb/usb-add-ehci-support-for-mx27-and-mx31-based-boards.patch +++ b/usb/usb-add-ehci-support-for-mx27-and-mx31-based-boards.patch @@ -181,7 +181,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +obj-$(CONFIG_USB_EHCI_MXC) += ehci.o --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1103,6 +1103,11 @@ MODULE_LICENSE ("GPL"); +@@ -1105,6 +1105,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_fsl_driver #endif diff --git a/usb/usb-add-support-for-xilinx-usb-host-controller.patch b/usb/usb-add-support-for-xilinx-usb-host-controller.patch index 4a4e8b920058b2..5136612653feb4 100644 --- a/usb/usb-add-support-for-xilinx-usb-host-controller.patch +++ b/usb/usb-add-support-for-xilinx-usb-host-controller.patch @@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1118,6 +1118,11 @@ MODULE_LICENSE ("GPL"); +@@ -1120,6 +1120,11 @@ MODULE_LICENSE ("GPL"); #define OF_PLATFORM_DRIVER ehci_hcd_ppc_of_driver #endif diff --git a/usb/usb-ehci-add-native-scatter-gather-support.patch b/usb/usb-ehci-add-native-scatter-gather-support.patch index 007805325d641f..d6d77590f7ab59 100644 --- a/usb/usb-ehci-add-native-scatter-gather-support.patch +++ b/usb/usb-ehci-add-native-scatter-gather-support.patch @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -604,6 +604,8 @@ static int ehci_init(struct usb_hcd *hcd +@@ -605,6 +605,8 @@ static int ehci_init(struct usb_hcd *hcd } ehci->command = temp; diff --git a/usb/usb-ehci-minor-constant-fix-for-schedule_slop.patch b/usb/usb-ehci-minor-constant-fix-for-schedule_slop.patch index 6f0e32ef6a1d24..d8979907921a99 100644 --- a/usb/usb-ehci-minor-constant-fix-for-schedule_slop.patch +++ b/usb/usb-ehci-minor-constant-fix-for-schedule_slop.patch @@ -23,7 +23,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/host/ehci-sched.c +++ b/drivers/usb/host/ehci-sched.c -@@ -1373,7 +1373,7 @@ sitd_slot_ok ( +@@ -1385,7 +1385,7 @@ sitd_slot_ok ( * given EHCI_TUNE_FLS and the slop). Or, write a smarter scheduler! */ @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> static int iso_stream_schedule ( -@@ -1387,7 +1387,7 @@ iso_stream_schedule ( +@@ -1399,7 +1399,7 @@ iso_stream_schedule ( unsigned mod = ehci->periodic_size << 3; struct ehci_iso_sched *sched = urb->hcpriv; @@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ehci_dbg (ehci, "iso request %p too long\n", urb); status = -EFBIG; goto fail; -@@ -1420,7 +1420,7 @@ iso_stream_schedule ( +@@ -1432,7 +1432,7 @@ iso_stream_schedule ( start += mod; /* Fell behind (by up to twice the slop amount)? */ @@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> start += period * DIV_ROUND_UP( max - start, period) - mod; -@@ -1439,7 +1439,7 @@ iso_stream_schedule ( +@@ -1451,7 +1451,7 @@ iso_stream_schedule ( * can also help high bandwidth if the dma and irq loads don't * jump until after the queue is primed. */ diff --git a/usb/usb-ehci-respect-ist-when-scheduling-new-split-itds.patch b/usb/usb-ehci-respect-ist-when-scheduling-new-split-itds.patch index 3f0a7819981cf0..3e67179fa40dc2 100644 --- a/usb/usb-ehci-respect-ist-when-scheduling-new-split-itds.patch +++ b/usb/usb-ehci-respect-ist-when-scheduling-new-split-itds.patch @@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -548,7 +548,7 @@ static int ehci_init(struct usb_hcd *hcd +@@ -549,7 +549,7 @@ static int ehci_init(struct usb_hcd *hcd /* controllers may cache some of the periodic schedule ... */ hcc_params = ehci_readl(ehci, &ehci->caps->hcc_params); if (HCC_ISOC_CACHE(hcc_params)) // full frame cache @@ -68,7 +68,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/host/ehci-sched.c +++ b/drivers/usb/host/ehci-sched.c -@@ -1382,10 +1382,11 @@ iso_stream_schedule ( +@@ -1394,10 +1394,11 @@ iso_stream_schedule ( struct ehci_iso_stream *stream ) { @@ -81,7 +81,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (sched->span > (mod - SCHEDULE_SLOP)) { ehci_dbg (ehci, "iso request %p too long\n", urb); -@@ -1406,26 +1407,35 @@ iso_stream_schedule ( +@@ -1418,26 +1419,35 @@ iso_stream_schedule ( now = ehci_readl(ehci, &ehci->regs->frame_index) % mod; @@ -125,7 +125,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> status = -EFBIG; goto fail; } -@@ -1470,7 +1480,7 @@ iso_stream_schedule ( +@@ -1482,7 +1492,7 @@ iso_stream_schedule ( /* no room in the schedule */ ehci_dbg (ehci, "iso %ssched full %p (now %d max %d)\n", list_empty (&stream->td_list) ? "" : "re", diff --git a/usb/usb-host-ehci-introduce-omap-ehci-hcd-driver.patch b/usb/usb-host-ehci-introduce-omap-ehci-hcd-driver.patch index d8ac4ccc24891b..a5e520a4f26a88 100644 --- a/usb/usb-host-ehci-introduce-omap-ehci-hcd-driver.patch +++ b/usb/usb-host-ehci-introduce-omap-ehci-hcd-driver.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1108,6 +1108,11 @@ MODULE_LICENSE ("GPL"); +@@ -1110,6 +1110,11 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_hcd_au1xxx_driver #endif diff --git a/usb/usb-option.c-add-support-for-d-link-dwm-162-u5.patch b/usb/usb-option.c-add-support-for-d-link-dwm-162-u5.patch index adfd6fb304a2bf..41ede84d9272f3 100644 --- a/usb/usb-option.c-add-support-for-d-link-dwm-162-u5.patch +++ b/usb/usb-option.c-add-support-for-d-link-dwm-162-u5.patch @@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -595,6 +595,7 @@ static struct usb_device_id option_ids[] +@@ -599,6 +599,7 @@ static struct usb_device_id option_ids[] { USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_G450) }, { USB_DEVICE(TOSHIBA_VENDOR_ID, TOSHIBA_PRODUCT_HSDPA_MINICARD ) }, /* Toshiba 3G HSDPA == Novatel Expedite EU870D MiniCard */ { USB_DEVICE(ALINK_VENDOR_ID, 0x9000) }, diff --git a/usb/usb-remove-the-auto_pm-flag.patch b/usb/usb-remove-the-auto_pm-flag.patch index 61aa1da70b1964..86a2c844f9e430 100644 --- a/usb/usb-remove-the-auto_pm-flag.patch +++ b/usb/usb-remove-the-auto_pm-flag.patch @@ -148,7 +148,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_pm_unlock(udev); --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -1308,7 +1308,7 @@ static int option_suspend(struct usb_ser +@@ -1313,7 +1313,7 @@ static int option_suspend(struct usb_ser dbg("%s entered", __func__); |