From: Jean-Christophe PLAGNIOL-VILLARD Date: Thu, 1 May 2008 00:13:43 +0000 (+0200) Subject: pxa: fix pcmcia operation on 'i' may be undefined X-Git-Tag: v1.3.3-rc3~5 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6d12e697de794d700767f22f950e3026ccf4daf6;p=u-boot pxa: fix pcmcia operation on 'i' may be undefined Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Wolfgang Denk --- diff --git a/drivers/pcmcia/pxa_pcmcia.c b/drivers/pcmcia/pxa_pcmcia.c index 6020e46283..65427efdbd 100644 --- a/drivers/pcmcia/pxa_pcmcia.c +++ b/drivers/pcmcia/pxa_pcmcia.c @@ -35,8 +35,10 @@ int pcmcia_on (void) debug ("%s\n", __FUNCTION__); i = 0; - while (reg_arr[i]) - *((volatile unsigned int *) reg_arr[i++]) |= reg_arr[i++]; + while (reg_arr[i]) { + (*(volatile unsigned int *) reg_arr[i]) |= reg_arr[i + 1]; + i += 2; + } udelay (1000); debug ("%s: programmed mem controller \n", __FUNCTION__); @@ -44,7 +46,7 @@ int pcmcia_on (void) #ifdef CONFIG_EXADRON1 /*define useful BCR masks */ -#define BCR_CF_INIT_VAL 0x00007230 +#define BCR_CF_INIT_VAL 0x00007230 #define BCR_CF_PWRON_BUSOFF_RESETOFF_VAL 0x00007231 #define BCR_CF_PWRON_BUSOFF_RESETON_VAL 0x00007233 #define BCR_CF_PWRON_BUSON_RESETON_VAL 0x00007213