Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d66ea8d4 authored by Marek Vasut's avatar Marek Vasut Committed by Eric Miao
Browse files

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



Signed-off-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarEric Miao <eric.miao@marvell.com>
parent c9b78189

drivers/pcmcia/pxa2xx_base.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/pcmcia/pxa2xx_palmld.c

+2 −2
Original line number Diff line number Diff line
@@ -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,