diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2011-09-04 15:01:56 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2011-09-04 15:01:56 +0000 |
commit | 32f899a9a74d28bdc328d60e2b83292f7bae4a1a (patch) | |
tree | ee3567416ac03fa35a53427750f8dfcda337ce40 /target/linux/generic | |
parent | 7034257bcee702715a1cb3765624043b3e307445 (diff) | |
download | upstream-32f899a9a74d28bdc328d60e2b83292f7bae4a1a.tar.gz upstream-32f899a9a74d28bdc328d60e2b83292f7bae4a1a.tar.bz2 upstream-32f899a9a74d28bdc328d60e2b83292f7bae4a1a.zip |
[generic/3.1]: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28163 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r-- | target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch index 6cef4d9918..ea39ac367e 100644 --- a/target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch +++ b/target/linux/generic/patches-3.1/102-ehci_hcd_ignore_oc.patch @@ -11,7 +11,7 @@ &ehci->regs->intr_enable); /* Turn On Interrupts */ --- a/drivers/usb/host/ehci-hub.c +++ b/drivers/usb/host/ehci-hub.c -@@ -581,7 +581,7 @@ ehci_hub_status_data (struct usb_hcd *hc +@@ -580,7 +580,7 @@ ehci_hub_status_data (struct usb_hcd *hc * always set, seem to clear PORT_OCC and PORT_CSC when writing to * PORT_POWER; that's surprising, but maybe within-spec. */ @@ -20,7 +20,7 @@ mask = PORT_CSC | PORT_PEC | PORT_OCC; else mask = PORT_CSC | PORT_PEC; -@@ -806,7 +806,7 @@ static int ehci_hub_control ( +@@ -805,7 +805,7 @@ static int ehci_hub_control ( if (temp & PORT_PEC) status |= USB_PORT_STAT_C_ENABLE << 16; |