aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/3c589_cs.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pcmcia/3c589_cs.c')
-rw-r--r--drivers/net/pcmcia/3c589_cs.c18
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index e36153851793..b15066be26f8 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -394,12 +394,8 @@ static int tc589_suspend(struct pcmcia_device *p_dev)
394 dev_link_t *link = dev_to_instance(p_dev); 394 dev_link_t *link = dev_to_instance(p_dev);
395 struct net_device *dev = link->priv; 395 struct net_device *dev = link->priv;
396 396
397 link->state |= DEV_SUSPEND; 397 if ((link->state & DEV_CONFIG) && (link->open))
398 if (link->state & DEV_CONFIG) { 398 netif_device_detach(dev);
399 if (link->open)
400 netif_device_detach(dev);
401 pcmcia_release_configuration(link->handle);
402 }
403 399
404 return 0; 400 return 0;
405} 401}
@@ -409,13 +405,9 @@ static int tc589_resume(struct pcmcia_device *p_dev)
409 dev_link_t *link = dev_to_instance(p_dev); 405 dev_link_t *link = dev_to_instance(p_dev);
410 struct net_device *dev = link->priv; 406 struct net_device *dev = link->priv;
411 407
412 link->state &= ~DEV_SUSPEND; 408 if ((link->state & DEV_CONFIG) && (link->open)) {
413 if (link->state & DEV_CONFIG) { 409 tc589_reset(dev);
414 pcmcia_request_configuration(link->handle, &link->conf); 410 netif_device_attach(dev);
415 if (link->open) {
416 tc589_reset(dev);
417 netif_device_attach(dev);
418 }
419 } 411 }
420 412
421 return 0; 413 return 0;