git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
USB: workaround for bug in old version of GCC
[pandora-kernel.git]
/
drivers
/
usb
/
host
/
pci-quirks.c
diff --git
a/drivers/usb/host/pci-quirks.c
b/drivers/usb/host/pci-quirks.c
index
629a968
..
c7fd6ce
100644
(file)
--- a/
drivers/usb/host/pci-quirks.c
+++ b/
drivers/usb/host/pci-quirks.c
@@
-13,6
+13,7
@@
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/pci.h>
#include <linux/init.h>
#include <linux/delay.h>
+#include <linux/export.h>
#include <linux/acpi.h>
#include <linux/dmi.h>
#include "pci-quirks.h"
#include <linux/acpi.h>
#include <linux/dmi.h>
#include "pci-quirks.h"
@@
-626,7
+627,7
@@
static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
void __iomem *base, *op_reg_base;
u32 hcc_params, cap, val;
u8 offset, cap_length;
void __iomem *base, *op_reg_base;
u32 hcc_params, cap, val;
u8 offset, cap_length;
- int wait_time,
delta,
count = 256/4;
+ int wait_time, count = 256/4;
if (!mmio_resource_enabled(pdev, 0))
return;
if (!mmio_resource_enabled(pdev, 0))
return;
@@
-672,11
+673,10
@@
static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev)
writel(val, op_reg_base + EHCI_USBCMD);
wait_time = 2000;
writel(val, op_reg_base + EHCI_USBCMD);
wait_time = 2000;
- delta = 100;
do {
writel(0x3f, op_reg_base + EHCI_USBSTS);
do {
writel(0x3f, op_reg_base + EHCI_USBSTS);
- udelay(
delta
);
- wait_time -=
delta
;
+ udelay(
100
);
+ wait_time -=
100
;
val = readl(op_reg_base + EHCI_USBSTS);
if ((val == ~(u32)0) || (val & EHCI_USBSTS_HALTED)) {
break;
val = readl(op_reg_base + EHCI_USBSTS);
if ((val == ~(u32)0) || (val & EHCI_USBSTS_HALTED)) {
break;