summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKuninori Morimoto2009-12-24 09:31:44 +0100
committerPaul Mundt2010-01-18 12:47:15 +0100
commitc718aff2e673a4f42de2a8b9f43bbfd700ce9544 (patch)
treebe5af25699bef51ddbd9f0870e68e0948c3bb7d1 /arch
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff)
downloadkernel-qcow2-linux-c718aff2e673a4f42de2a8b9f43bbfd700ce9544.tar.gz
kernel-qcow2-linux-c718aff2e673a4f42de2a8b9f43bbfd700ce9544.tar.xz
kernel-qcow2-linux-c718aff2e673a4f42de2a8b9f43bbfd700ce9544.zip
sh: ms7724: Correct sh-eth EEPROM polling timeout.
This converts the cpu_relax() to a udelay(1), which fixes up issues with the EEPROM polling occasionally timing out. Signed-off-by: Kuninori Morimoto <morimoto.kuninori@renesas.com> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sh/boards/mach-se/7724/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index 5d0f70b46c97..858ecb25d469 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -533,7 +533,7 @@ static int __init sh_eth_is_eeprom_ready(void)
while (t--) {
if (!ctrl_inw(EEPROM_STAT))
return 1;
- cpu_relax();
+ udelay(1);
}
printk(KERN_ERR "ms7724se can not access to eeprom\n");