[ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0

[pandora-kernel.git] / drivers / pcmcia / pxa2xx_base.c

diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 16f84aa..c49a726 100644 (file)
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -214,7 +214,7 @@ static void pxa2xx_configure_sockets(struct device *dev)
        MECR |= MECR_CIT;
 
        /* Set MECR:NOS (Number Of Sockets) */
-       if (ops->nr > 1 || machine_is_viper())
+       if ((ops->first + ops->nr) > 1 || machine_is_viper())
                MECR |= MECR_NOS;
        else
                MECR &= ~MECR_NOS;
@@ -250,7 +250,7 @@ int __pxa2xx_drv_pcmcia_probe(struct device *dev)
        for (i = 0; i < ops->nr; i++) {
                skt = &sinfo->skt[i];
 
-               skt->nr         = i;
+               skt->nr         = ops->first + i;
                skt->irq        = NO_IRQ;
 
                skt->res_skt.start      = _PCMCIA(skt->nr);