Use pcmcia_request_irq() instead of request_irq() to request the irq for the PCMCIA device. This allows the PCMCIA core to clean up the registration in pcmcia_disable_device().
Signed-off-by: H Hartley Sweeten <[email protected]> Cc: Ian Abbott <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> --- drivers/staging/comedi/drivers/cb_das16_cs.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index 8763726..e1318fa 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c @@ -418,12 +418,9 @@ static int das16cs_auto_attach(struct comedi_device *dev, return ret; dev->iobase = link->resource[0]->start; - if (!link->irq) - return -EINVAL; - - ret = request_irq(link->irq, das16cs_interrupt, IRQF_SHARED, - dev->board_name, dev); - if (ret < 0) + link->priv = dev; + ret = pcmcia_request_irq(link, das16cs_interrupt); + if (ret) return ret; dev->irq = link->irq; @@ -482,8 +479,6 @@ static int das16cs_auto_attach(struct comedi_device *dev, static void das16cs_detach(struct comedi_device *dev) { - if (dev->irq) - free_irq(dev->irq, dev); comedi_pcmcia_disable(dev); } -- 1.8.1.1.293.gfe73786 _______________________________________________ devel mailing list [email protected] http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
