Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[EMAIL PROTECTED]>
diff --git a/drivers/pcmcia/pxa_pcmcia.c b/drivers/pcmcia/pxa_pcmcia.c
index 6020e46..7b02050 100644
--- a/drivers/pcmcia/pxa_pcmcia.c
+++ b/drivers/pcmcia/pxa_pcmcia.c
@@ -24,7 +24,8 @@ int pcmcia_on (void)
0, 0
};
- int i, rc;
+ int rc;
+ int i = 0;
#ifdef CONFIG_EXADRON1
int cardDetect;
@@ -34,9 +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
--
1.5.4.5
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
U-Boot-Users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/u-boot-users