diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-21 18:31:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-21 18:31:15 +0200 |
| commit | cd5b8f8755a89a57fc8c408d284b8b613f090345 (patch) | |
| tree | 815d171db7d102c78458103da9be4949fa31e816 | |
| parent | Merge branch 'shrinker' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc/... (diff) | |
| parent | pcmcia: fix 'driver ... did not release config properly' warning (diff) | |
| download | linux-cd5b8f8755a89a57fc8c408d284b8b613f090345.tar.xz linux-cd5b8f8755a89a57fc8c408d284b8b613f090345.zip | |
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
| -rw-r--r-- | drivers/pcmcia/pcmcia_resource.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index 29f91fac1dff..a4cd9adfcbc0 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); } |