diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-29 17:24:35 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-29 17:24:35 -0800 |
| commit | 00fd6a7194d2f3be3ecc4fde0af02b39823afdcc (patch) | |
| tree | 9c720cbb271a42014ca6c256da5741f4b04feff2 /arch/mips/pci/pci-rt2880.c | |
| parent | d72aee78e9bb956265480a118bdba2fc99dbf4bf (diff) | |
| parent | c861519fcf95b2d46cb4275903423b43ae150a40 (diff) | |
| download | linux-stable-00fd6a7194d2f3be3ecc4fde0af02b39823afdcc.tar.gz linux-stable-00fd6a7194d2f3be3ecc4fde0af02b39823afdcc.tar.bz2 linux-stable-00fd6a7194d2f3be3ecc4fde0af02b39823afdcc.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fix from Ralf Baechle:
"Just a fix for empty loops that may be removed by non-antique GCC"
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
MIPS: Fix delay loops which may be removed by GCC.
Diffstat (limited to 'arch/mips/pci/pci-rt2880.c')
| -rw-r--r-- | arch/mips/pci/pci-rt2880.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/pci/pci-rt2880.c b/arch/mips/pci/pci-rt2880.c index 8a978022630b..dbbeccc3d714 100644 --- a/arch/mips/pci/pci-rt2880.c +++ b/arch/mips/pci/pci-rt2880.c @@ -11,6 +11,7 @@ * by the Free Software Foundation. */ +#include <linux/delay.h> #include <linux/types.h> #include <linux/pci.h> #include <linux/io.h> @@ -232,8 +233,7 @@ static int rt288x_pci_probe(struct platform_device *pdev) ioport_resource.end = RT2880_PCI_IO_BASE + RT2880_PCI_IO_SIZE - 1; rt2880_pci_reg_write(0, RT2880_PCI_REG_PCICFG_ADDR); - for (i = 0; i < 0xfffff; i++) - ; + udelay(1); rt2880_pci_reg_write(0x79, RT2880_PCI_REG_ARBCTL); rt2880_pci_reg_write(0x07FF0001, RT2880_PCI_REG_BAR0SETUP_ADDR); |