Commit 14bf9e0a authored by Russell King's avatar Russell King

[ARM] Minor fixes to drivers/pcmcia/sa1111_generic.c.

Only set IRQ type after a successful request_irq().
Driver now known as sa1111-pcmcia in driverfs.
parent b9659d3c
...@@ -36,11 +36,11 @@ int sa1111_pcmcia_init(struct pcmcia_init *init) ...@@ -36,11 +36,11 @@ int sa1111_pcmcia_init(struct pcmcia_init *init)
int i, ret; int i, ret;
for (i = ret = 0; i < ARRAY_SIZE(irqs); i++) { for (i = ret = 0; i < ARRAY_SIZE(irqs); i++) {
set_irq_type(irqs[i].irq, IRQT_FALLING);
ret = request_irq(irqs[i].irq, init->handler, SA_INTERRUPT, ret = request_irq(irqs[i].irq, init->handler, SA_INTERRUPT,
irqs[i].str, NULL); irqs[i].str, NULL);
if (ret) if (ret)
break; break;
set_irq_type(irqs[i].irq, IRQT_FALLING);
} }
if (i < ARRAY_SIZE(irqs)) { if (i < ARRAY_SIZE(irqs)) {
...@@ -280,7 +280,7 @@ static int pcmcia_resume(struct device *dev, u32 level) ...@@ -280,7 +280,7 @@ static int pcmcia_resume(struct device *dev, u32 level)
static struct sa1111_driver pcmcia_driver = { static struct sa1111_driver pcmcia_driver = {
.drv = { .drv = {
.name = "SA1111 PCMCIA", .name = "sa1111-pcmcia",
.bus = &sa1111_bus_type, .bus = &sa1111_bus_type,
.probe = pcmcia_probe, .probe = pcmcia_probe,
.remove = __devexit_p(pcmcia_remove), .remove = __devexit_p(pcmcia_remove),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment