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

Commit 00293972 authored by Eric Miao's avatar Eric Miao Committed by Russell King
Browse files

ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq 



commit 66024db5 removes all other references of skt->irq by using
skt->socket.pci_irq, while leaving these two missed. Get them fixed.

Signed-off-by: default avatarEric Miao <eric.y.miao@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d0d26c33

drivers/pcmcia/pxa2xx_palmtc.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int palmtc_pcmcia_hw_init(struct soc_pcmcia_socket *skt) 
	if (ret)

		goto err7;



	skt->irq = IRQ_GPIO(GPIO_NR_PALMTC_PCMCIA_READY);

	skt->socket.pci_irq = IRQ_GPIO(GPIO_NR_PALMTC_PCMCIA_READY);

	return 0;



err7:

drivers/pcmcia/pxa2xx_stargate2.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static struct pcmcia_irqs irqs[] = { 


static int sg2_pcmcia_hw_init(struct soc_pcmcia_socket *skt)

{

	skt->irq = IRQ_GPIO(SG2_S0_GPIO_READY);

	skt->socket.pci_irq = IRQ_GPIO(SG2_S0_GPIO_READY);

	return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));

}