pcmcia: fix 'driver ... did not release config properly' warning
commit b1be4845dffefe212959ee02b783571eead3e350
Author: Patrick McHardy <[email protected]> Date: Thu Jun 17 04:43:07 2010 +0200
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 Patrick McHardy <[email protected]>
drivers/pcmcia/pcmcia_resource.c +3 -1
@@ -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); }
Applied, thanks.
Best,
Doinik
Quoted 30 lines · Patrick McHardy
commit
b1be4845dffefe212959ee02b783571eead3e350Author: Patrick McHardy <[email protected]> Date: Thu Jun 17 04:43:07 2010 +0200pcmcia: fix 'driver ... did not release config properly' warning
Up to 2.6.34
pcmcia_release_irq()resetp_dev->_irqto 0 after releasing the irq. The IRQ is now released inpcmcia_disable_device(), howeverp_dev->_irqis not reset, triggering a warning inpcmcia_device_remove().Signed-off-by Patrick McHardy <[email protected]>drivers/pcmcia/pcmcia_resource.c +3
-1@@ -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); }