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

Commit bcd22e8e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: cb_das16_cs: use pcmcia_request_irq() 



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9e29ce10

drivers/staging/comedi/drivers/cb_das16_cs.c

+3 −8
Original line number Diff line number Diff line
@@ -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);

}