brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014

[openwrt/staging/lynxis/omap.git] / target / linux / brcm2708 / patches-3.10 / 0060-dwc_otg-fix-NAK-holdoff-and-allow-on-split-transacti.patch

diff --git a/target/linux/brcm2708/patches-3.10/0060-dwc_otg-fix-NAK-holdoff-and-allow-on-split-transacti.patch b/target/linux/brcm2708/patches-3.10/0060-dwc_otg-fix-NAK-holdoff-and-allow-on-split-transacti.patch
index ae5bfe9b26981b65867be3b16a2d9cc3e4d57fad..94bec178612f8ab02bec33cec5e16e603697bab1 100644 (file)
--- a/target/linux/brcm2708/patches-3.10/0060-dwc_otg-fix-NAK-holdoff-and-allow-on-split-transacti.patch
+++ b/target/linux/brcm2708/patches-3.10/0060-dwc_otg-fix-NAK-holdoff-and-allow-on-split-transacti.patch
@@ -1,7 +1,7 @@
-From 370cbdb4a5ec521d9312b02bbaf269ed520b1451 Mon Sep 17 00:00:00 2001
+From 3cb2c23c6dba5ae74976e85329b880876fadd787 Mon Sep 17 00:00:00 2001
 From: P33M <P33M@github.com>
 Date: Mon, 22 Apr 2013 00:08:36 +0100
-Subject: [PATCH 060/174] dwc_otg: fix NAK holdoff and allow on split
+Subject: [PATCH 060/196] dwc_otg: fix NAK holdoff and allow on split
  transactions only
 
 This corrects a bug where if a single active non-periodic endpoint
@@ -18,6 +18,8 @@ only split transactions get held off.
  drivers/usb/host/dwc_otg/dwc_otg_hcd.c | 28 ++++++++++++++++++----------
  1 file changed, 18 insertions(+), 10 deletions(-)
 
+diff --git a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
+index 91eefec..eaa8f38 100644
 --- a/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 +++ b/drivers/usb/host/dwc_otg/dwc_otg_hcd.c
 @@ -46,7 +46,7 @@
@@ -29,7 +31,7 @@ only split transactions get held off.
  
  //#define DEBUG_HOST_CHANNELS
  #ifdef DEBUG_HOST_CHANNELS
-@@ -1349,18 +1349,26 @@ dwc_otg_transaction_type_e dwc_otg_hcd_s
+@@ -1349,18 +1349,26 @@ dwc_otg_transaction_type_e dwc_otg_hcd_select_transactions(dwc_otg_hcd_t * hcd)
  
                /*
                 * Check to see if this is a NAK'd retransmit, in which case ignore for retransmission
@@ -65,3 +67,6 @@ only split transactions get held off.
                if (microframe_schedule) {
                                DWC_SPINLOCK_IRQSAVE(channel_lock, &flags);
                                if (hcd->available_host_channels < 1) {
+-- 
+1.9.1
+