aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia/pcmcia_resource.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2010-07-20 15:21:42 -0700
committerDominik Brodowski <linux@dominikbrodowski.net>2010-07-21 13:52:36 +0200
commit418c527873049a9b866aa02948931d7baad7094a (patch)
treecffd9ab1400064dd342856fe2bae6153eeb96259 /drivers/pcmcia/pcmcia_resource.c
parentf4b23cc2d5dc78ef5acbc529eb1219cc41eb5b96 (diff)
downloadmrst-s0i3-test-418c527873049a9b866aa02948931d7baad7094a.tar.gz
mrst-s0i3-test-418c527873049a9b866aa02948931d7baad7094a.tar.xz
mrst-s0i3-test-418c527873049a9b866aa02948931d7baad7094a.zip
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 <kaber@trash.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/pcmcia_resource.c')
-rw-r--r--drivers/pcmcia/pcmcia_resource.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 29f91fac1df..a4cd9adfcbc 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -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);
}