Pull hotplug into release branch

[linux-2.6-omap-h63xx.git] / drivers / pcmcia / pxa2xx_base.c

diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index dca9f8549b32503c081498cc5a8f159c4d72c192..874923fcb2f9615fee7f34715c15e12b57d93742 100644 (file)
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -58,7 +58,7 @@ static inline u_int pxa2xx_mcxx_asst(u_int pcmcia_cycle_ns,
                                     u_int mem_clk_10khz)
 {
        u_int code = pcmcia_cycle_ns * mem_clk_10khz;
-       return (code / 300000) + ((code % 300000) ? 1 : 0) - 1;
+       return (code / 300000) + ((code % 300000) ? 1 : 0) + 1;
 }
 
 static inline u_int pxa2xx_mcxx_setup(u_int pcmcia_cycle_ns,