Skip to content

Commit

Permalink
ARM: pxa: fix now incorrect reference of skt->irq by using skt->socke…
Browse files Browse the repository at this point in the history
…t.pci_irq

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

Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Eric Miao authored and Russell King committed Dec 13, 2009
1 parent d0d26c3 commit 0029397
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/pcmcia/pxa2xx_palmtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion drivers/pcmcia/pxa2xx_stargate2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down

0 comments on commit 0029397

Please sign in to comment.