Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97ff22ee authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: workaround for bug in old version of GCC 



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: default avatarAlan Stern <stern@rowland.harvard.edu>
Reported-by: default avatarKonrad Rzepecki <krzepecki@dentonet.pl>
Tested-by: default avatarKonrad Rzepecki <krzepecki@dentonet.pl>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 583182ba

drivers/usb/host/pci-quirks.c

+3 −4
Original line number Diff line number Diff line
@@ -627,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;

	int	wait_time, delta, count = 256/4;

	int	wait_time, count = 256/4;



	if (!mmio_resource_enabled(pdev, 0))

		return;
@@ -673,11 +673,10 @@ static void __devinit quirk_usb_disable_ehci(struct pci_dev *pdev) 
		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;