This patch (as1491) works around a bug in GCC-3.4.6, which is still
supposed to be supported. The number of microseconds in the udelay()
call in quirk_usb_disable_ehci() is fixed at 100, but the compiler
doesn't understand this and generates a link-time error. So we
replace the otherwise unused variable "delta" with a simple constant
100. This same pattern is already used in other delay loops in that
source file.
Signed-off-by: Alan Stern <stern@xxxxxxxxxxxxxxxxxxx>
Reported-by: Konrad Rzepecki <krzepecki@xxxxxxxxxxx>
CC: <stable@xxxxxxxxxx>
---
On Thu, 27 Oct 2011, Greg KH wrote:
> Good point. Try what Alan suggested and post this on the linux-kernel
> mailing list, it's not a USB specific issue that we can help you out
> with here, sorry.
It's really not a very big issue. This patch will fix the problem; I
don't see any reason not to merge it.
Alan Stern
drivers/usb/host/pci-quirks.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
Index: usb-3.1/drivers/usb/host/pci-quirks.c
===================================================================
--- usb-3.1.orig/drivers/usb/host/pci-quirks.c
+++ usb-3.1/drivers/usb/host/pci-quirks.c
@@ -626,7 +626,7 @@ static void __devinit quirk_usb_disable_
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;
@@ -672,11 +672,10 @@ static void __devinit quirk_usb_disable_
writel(val, op_reg_base + EHCI_USBCMD);
wait_time = 2000;
- delta = 100;
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;
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
