kernel: bump 3.18 to 3.18.119

[openwrt/staging/mkresin.git] / target / linux / mcs814x / patches-3.18 / 013-ohci_workarounds.patch

diff --git a/target/linux/mcs814x/patches-3.18/013-ohci_workarounds.patch b/target/linux/mcs814x/patches-3.18/013-ohci_workarounds.patch
index 8697f033865e8b6e7560885a5a6066d8b68acd24..9d4982b0fbaf9f1983f244304bef15a35ae024c8 100644 (file)
--- a/target/linux/mcs814x/patches-3.18/013-ohci_workarounds.patch
+++ b/target/linux/mcs814x/patches-3.18/013-ohci_workarounds.patch
@@ -18,8 +18,8 @@
 +      u32 hcca_area;
  
        /* Accept arbitrarily long scatter-gather lists */
-       hcd->self.sg_tablesize = ~0;
-@@ -501,11 +502,13 @@ static int ohci_init (struct ohci_hcd *o
+       if (!(hcd->driver->flags & HCD_LOCAL_MEM))
+@@ -502,11 +503,13 @@ static int ohci_init (struct ohci_hcd *o
                        (unsigned long) ohci);
        set_timer_slack(&ohci->io_watchdog, msecs_to_jiffies(20));
  
@@ -35,7 +35,7 @@
        if ((ret = ohci_mem_init (ohci)) < 0)
                ohci_stop (hcd);
        else {
-@@ -523,6 +526,7 @@ static int ohci_init (struct ohci_hcd *o
+@@ -524,6 +527,7 @@ static int ohci_init (struct ohci_hcd *o
   */
  static int ohci_run (struct ohci_hcd *ohci)
  {
@@ -43,7 +43,7 @@
        u32                     mask, val;
        int                     first = ohci->fminterval == 0;
        struct usb_hcd          *hcd = ohci_to_hcd(ohci);
-@@ -573,6 +577,8 @@ static int ohci_run (struct ohci_hcd *oh
+@@ -574,6 +578,8 @@ static int ohci_run (struct ohci_hcd *oh
        msleep(val);
  
        memset (ohci->hcca, 0, sizeof (struct ohci_hcca));
@@ -52,7 +52,7 @@
  
        /* 2msec timelimit here means no irqs/preempt */
        spin_lock_irq (&ohci->lock);
-@@ -984,9 +990,6 @@ static void ohci_stop (struct usb_hcd *h
+@@ -985,9 +991,6 @@ static void ohci_stop (struct usb_hcd *h
        remove_debug_files (ohci);
        ohci_mem_cleanup (ohci);
        if (ohci->hcca) {