diff options
Diffstat (limited to 'drivers/net/pcmcia/3c574_cs.c')
-rw-r--r-- | drivers/net/pcmcia/3c574_cs.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c index 1799660bdc67..8dfa30b3c70a 100644 --- a/drivers/net/pcmcia/3c574_cs.c +++ b/drivers/net/pcmcia/3c574_cs.c | |||
@@ -519,12 +519,8 @@ static int tc574_suspend(struct pcmcia_device *p_dev) | |||
519 | dev_link_t *link = dev_to_instance(p_dev); | 519 | dev_link_t *link = dev_to_instance(p_dev); |
520 | struct net_device *dev = link->priv; | 520 | struct net_device *dev = link->priv; |
521 | 521 | ||
522 | link->state |= DEV_SUSPEND; | 522 | if ((link->state & DEV_CONFIG) && (link->open)) |
523 | if (link->state & DEV_CONFIG) { | 523 | netif_device_detach(dev); |
524 | if (link->open) | ||
525 | netif_device_detach(dev); | ||
526 | pcmcia_release_configuration(link->handle); | ||
527 | } | ||
528 | 524 | ||
529 | return 0; | 525 | return 0; |
530 | } | 526 | } |
@@ -534,13 +530,9 @@ static int tc574_resume(struct pcmcia_device *p_dev) | |||
534 | dev_link_t *link = dev_to_instance(p_dev); | 530 | dev_link_t *link = dev_to_instance(p_dev); |
535 | struct net_device *dev = link->priv; | 531 | struct net_device *dev = link->priv; |
536 | 532 | ||
537 | link->state &= ~DEV_SUSPEND; | 533 | if ((link->state & DEV_CONFIG) && (link->open)) { |
538 | if (link->state & DEV_CONFIG) { | 534 | tc574_reset(dev); |
539 | pcmcia_request_configuration(link->handle, &link->conf); | 535 | netif_device_attach(dev); |
540 | if (link->open) { | ||
541 | tc574_reset(dev); | ||
542 | netif_device_attach(dev); | ||
543 | } | ||
544 | } | 536 | } |
545 | 537 | ||
546 | return 0; | 538 | return 0; |