Commit de69a1ad authored by Alan Cox's avatar Alan Cox Committed by Steve French

[PATCH] fix further timer in pcmcia stuff

#ra1
parent 57af3ff0
...@@ -357,7 +357,7 @@ static void pcnet_detach(dev_link_t *link) ...@@ -357,7 +357,7 @@ static void pcnet_detach(dev_link_t *link)
if (*linkp == NULL) if (*linkp == NULL)
return; return;
del_timer(&link->release); del_timer_sync(&link->release);
if (link->state & DEV_CONFIG) { if (link->state & DEV_CONFIG) {
pcnet_release((u_long)link); pcnet_release((u_long)link);
if (link->state & DEV_STALE_CONFIG) { if (link->state & DEV_STALE_CONFIG) {
...@@ -1052,7 +1052,7 @@ static int pcnet_close(struct net_device *dev) ...@@ -1052,7 +1052,7 @@ static int pcnet_close(struct net_device *dev)
link->open--; link->open--;
netif_stop_queue(dev); netif_stop_queue(dev);
del_timer(&info->watchdog); del_timer_sync(&info->watchdog);
if (link->state & DEV_STALE_CONFIG) if (link->state & DEV_STALE_CONFIG)
mod_timer(&link->release, jiffies + HZ/20); mod_timer(&link->release, jiffies + HZ/20);
......
...@@ -433,7 +433,7 @@ static void smc91c92_detach(dev_link_t *link) ...@@ -433,7 +433,7 @@ static void smc91c92_detach(dev_link_t *link)
if (*linkp == NULL) if (*linkp == NULL)
return; return;
del_timer(&link->release); del_timer_sync(&link->release);
if (link->state & DEV_CONFIG) { if (link->state & DEV_CONFIG) {
smc91c92_release((u_long)link); smc91c92_release((u_long)link);
if (link->state & DEV_STALE_CONFIG) { if (link->state & DEV_STALE_CONFIG) {
...@@ -1330,7 +1330,7 @@ static int smc_close(struct net_device *dev) ...@@ -1330,7 +1330,7 @@ static int smc_close(struct net_device *dev)
outw(CTL_POWERDOWN, ioaddr + CONTROL ); outw(CTL_POWERDOWN, ioaddr + CONTROL );
link->open--; link->open--;
del_timer(&smc->media); del_timer_sync(&smc->media);
if (link->state & DEV_STALE_CONFIG) if (link->state & DEV_STALE_CONFIG)
mod_timer(&link->release, jiffies + HZ/20); mod_timer(&link->release, jiffies + HZ/20);
......
...@@ -689,7 +689,7 @@ xirc2ps_detach(dev_link_t * link) ...@@ -689,7 +689,7 @@ xirc2ps_detach(dev_link_t * link)
* the release() function is called, that will trigger a proper * the release() function is called, that will trigger a proper
* detach(). * detach().
*/ */
del_timer(&link->release); del_timer_sync(&link->release);
if (link->state & DEV_CONFIG) { if (link->state & DEV_CONFIG) {
xirc2ps_release((unsigned long)link); xirc2ps_release((unsigned long)link);
if (link->state & DEV_STALE_CONFIG) { if (link->state & DEV_STALE_CONFIG) {
......
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