Commit a0aab143 authored by Dominik Brodowski's avatar Dominik Brodowski

[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: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 90ff8700
...@@ -476,6 +476,8 @@ static int pcmcia_device_remove(struct device * dev) ...@@ -476,6 +476,8 @@ static int pcmcia_device_remove(struct device * dev)
if (p_drv->remove) if (p_drv->remove)
p_drv->remove(p_dev); p_drv->remove(p_dev);
p_dev->dev_node = NULL;
/* check for proper unloading */ /* check for proper unloading */
if (p_dev->_irq || p_dev->_io || p_dev->_locked) if (p_dev->_irq || p_dev->_io || p_dev->_locked)
printk(KERN_INFO "pcmcia: driver %s did not release config properly\n", printk(KERN_INFO "pcmcia: driver %s did not release config properly\n",
......
...@@ -947,7 +947,5 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev) { ...@@ -947,7 +947,5 @@ void pcmcia_disable_device(struct pcmcia_device *p_dev) {
pcmcia_release_irq(p_dev, &p_dev->irq); pcmcia_release_irq(p_dev, &p_dev->irq);
if (&p_dev->win) if (&p_dev->win)
pcmcia_release_window(p_dev->win); pcmcia_release_window(p_dev->win);
p_dev->dev_node = NULL;
} }
EXPORT_SYMBOL(pcmcia_disable_device); EXPORT_SYMBOL(pcmcia_disable_device);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment