Skip to contentSkip to conversation

pcmcia: fix now incorrect reference of skt->irq

PATCH New Eric Miao 1 participant 1 message Dec 9, 2009

Subsystems (2)
lore
Share & tools
lore

Eric Miao

author
#0 lore raw

PATCH 2/2 pcmcia: fix now incorrect reference of skt->irq

by using skt->socket.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.

---
 drivers/pcmcia/pxa2xx_palmtc.c    |    2 +-
 drivers/pcmcia/pxa2xx_stargate2.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/pcmcia/pxa2xx_palmtc.c +0 -0
index 3a8993e..459a232 100644
@@ -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:

(quoted diff) +0 -0

b/drivers/pcmcia/pxa2xx_stargate2.c
index 490749e..d08802f 100644

drivers/pcmcia/pxa2xx_stargate2.c +1 -1
@@ -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));
 }
 
Signature · 1 line
1.6.3.3