Linus,
one PCMCIA bugfix slipped through... In order to solve this issue, please
pull from
git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git urgent
The diffstat and list of changes follows; the patch is also attached below.
Patrick McHardy (1):
pcmcia: fix 'driver ... did not release config properly' warning
drivers/pcmcia/pcmcia_resource.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
---
From: Patrick McHardy <ka...@trash.net>
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 <ka...@trash.net>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Dominik Brodowski <li...@dominikbrodowski.net>
---
drivers/pcmcia/pcmcia_resource.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff -puN
drivers/pcmcia/pcmcia_resource.c~pcmcia-fix-driver-did-not-release-config-properly-warning
drivers/pcmcia/pcmcia_resource.c
---
a/drivers/pcmcia/pcmcia_resource.c~pcmcia-fix-driver-did-not-release-config-properly-warning
+++ a/drivers/pcmcia/pcmcia_resource.c
@@ -857,8 +857,10 @@ void pcmcia_disable_device(struct pcmcia
{
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);
}
_______________________________________________
Linux PCMCIA reimplementation list
http://lists.infradead.org/mailman/listinfo/linux-pcmcia
