Merge ../linus

1 files changed, 2 insertions, 1 deletions

diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index 75efb5da5b6d..a66ac61233a2 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -293,7 +293,8 @@ static void __init get_assabet_scr(void)
         GPDR |= 0x3fc;                  /* Configure GPIO 9:2 as outputs */
         GPSR = 0x3fc;                   /* Write 0xFF to GPIO 9:2 */
         GPDR &= ~(0x3fc);               /* Configure GPIO 9:2 as inputs */
-        for(i = 100; i--; scr = GPLR);  /* Read GPIO 9:2 */
+        for(i = 100; i--; )             /* Read GPIO 9:2 */
+                scr = GPLR;
         GPDR |= 0x3fc;                  /*  restore correct pin direction */
         scr &= 0x3fc;                   /* save as system configuration byte. */
         SCR_value = scr;