diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2009-03-28 10:56:28 +0100 |
|---|---|---|
| committer | Eric Miao <eric.miao@marvell.com> | 2009-03-28 12:24:39 +0100 |
| commit | d66ea8d4c2aa7199cf4e5c977eb25764e5fc5da9 (patch) | |
| tree | d27b7be3712edf39f655545c56eb9e68cff85337 /drivers/pcmcia | |
| parent | [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins (diff) | |
| download | linux-d66ea8d4c2aa7199cf4e5c977eb25764e5fc5da9.tar.xz linux-d66ea8d4c2aa7199cf4e5c977eb25764e5fc5da9.zip | |
[ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Diffstat (limited to 'drivers/pcmcia')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_base.c | 4 | ||||
| -rw-r--r-- | drivers/pcmcia/pxa2xx_palmld.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 16f84aab6ab3..c49a7269f6d1 100644 --- 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); diff --git a/drivers/pcmcia/pxa2xx_palmld.c b/drivers/pcmcia/pxa2xx_palmld.c index 1736c67e547e..5ba9b3664a00 100644 --- a/drivers/pcmcia/pxa2xx_palmld.c +++ b/drivers/pcmcia/pxa2xx_palmld.c @@ -98,8 +98,8 @@ static void palmld_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt) static struct pcmcia_low_level palmld_pcmcia_ops = { .owner = THIS_MODULE, - .first = 0, - .nr = 2, + .first = 1, + .nr = 1, .hw_init = palmld_pcmcia_hw_init, .hw_shutdown = palmld_pcmcia_hw_shutdown, |