From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Tue, 4 Apr 2006 09:09:26 +0000 (+0200)
Subject: [PATCH] pcmcia: do not set dev_node to NULL too early
X-Git-Tag: v2.6.17-rc3~28^2~4
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0aab14322a74ab5665704c6155bf48fbc38f445;p=linux-2.6

[PATCH] pcmcia: do not set dev_node to NULL too early

If we set dev_node to NULL too early, some drivers which used this to
determine whether unregister_netdev() needs to be called fail when removing
a PCMCIA card.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 7b7428c77d..0f98cab351 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -476,6 +476,8 @@ static int pcmcia_device_remove(struct device * dev)
 	if (p_drv->remove)
 	       	p_drv->remove(p_dev);
 
+	p_dev->dev_node = NULL;
+
 	/* check for proper unloading */
 	if (p_dev->_irq || p_dev->_io || p_dev->_locked)
 		printk(KERN_INFO "pcmcia: driver %s did not release config properly\n",
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c
index 45063b4e5b..2539c0b230 100644
--- a/drivers/pcmcia/pcmcia_resource.c
+++ b/drivers/pcmcia/pcmcia_resource.c
@@ -947,7 +947,5 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev) {
 	pcmcia_release_irq(p_dev, &p_dev->irq);
 	if (&p_dev->win)
 		pcmcia_release_window(p_dev->win);
-
-	p_dev->dev_node = NULL;
 }
 EXPORT_SYMBOL(pcmcia_disable_device);