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

Commit 418c5278 authored by Patrick McHardy's avatar Patrick McHardy Committed by Dominik Brodowski
Browse files

pcmcia: fix 'driver ... did not release config properly' warning 



Up to 2.6.34 pcmcia_release_irq() reset p_dev->_irq to 0 after releasing
the irq.  The IRQ is now released in pcmcia_disable_device(), however
p_dev->_irq is not reset, triggering a warning in pcmcia_device_remove().

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent f4b23cc2

drivers/pcmcia/pcmcia_resource.c

+3 −1
Original line number Diff line number Diff line
@@ -857,8 +857,10 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev) 
{

	pcmcia_release_configuration(p_dev);

	pcmcia_release_io(p_dev, &p_dev->io);

	if (p_dev->_irq)

	if (p_dev->_irq) {

		free_irq(p_dev->irq, p_dev->priv);

		p_dev->_irq = 0;

	}

	if (p_dev->win)

		pcmcia_release_window(p_dev, p_dev->win);

}