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

Commit cd5b8f87 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 

* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
  pcmcia: fix 'driver ... did not release config properly' warning
parents 052a1cdb 418c5278

drivers/pcmcia/pcmcia_resource.c

+3 −1
Original line number Original line 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_configuration(p_dev);

	pcmcia_release_io(p_dev, &p_dev->io);

	pcmcia_release_io(p_dev, &p_dev->io);

	if (p_dev->_irq)

	if (p_dev->_irq) {

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

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

		p_dev->_irq = 0;

	}

	if (p_dev->win)

	if (p_dev->win)

		pcmcia_release_window(p_dev, p_dev->win);

		pcmcia_release_window(p_dev, p_dev->win);

}

}