diff options
Diffstat (limited to 'drivers/net/wireless/atmel_cs.c')
-rw-r--r-- | drivers/net/wireless/atmel_cs.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c index 1da8e6197ffb..89dbc783ff80 100644 --- a/drivers/net/wireless/atmel_cs.c +++ b/drivers/net/wireless/atmel_cs.c | |||
@@ -433,11 +433,8 @@ static int atmel_suspend(struct pcmcia_device *dev) | |||
433 | dev_link_t *link = dev_to_instance(dev); | 433 | dev_link_t *link = dev_to_instance(dev); |
434 | local_info_t *local = link->priv; | 434 | local_info_t *local = link->priv; |
435 | 435 | ||
436 | link->state |= DEV_SUSPEND; | 436 | if (link->state & DEV_CONFIG) |
437 | if (link->state & DEV_CONFIG) { | ||
438 | netif_device_detach(local->eth_dev); | 437 | netif_device_detach(local->eth_dev); |
439 | pcmcia_release_configuration(link->handle); | ||
440 | } | ||
441 | 438 | ||
442 | return 0; | 439 | return 0; |
443 | } | 440 | } |
@@ -447,9 +444,7 @@ static int atmel_resume(struct pcmcia_device *dev) | |||
447 | dev_link_t *link = dev_to_instance(dev); | 444 | dev_link_t *link = dev_to_instance(dev); |
448 | local_info_t *local = link->priv; | 445 | local_info_t *local = link->priv; |
449 | 446 | ||
450 | link->state &= ~DEV_SUSPEND; | ||
451 | if (link->state & DEV_CONFIG) { | 447 | if (link->state & DEV_CONFIG) { |
452 | pcmcia_request_configuration(link->handle, &link->conf); | ||
453 | atmel_open(local->eth_dev); | 448 | atmel_open(local->eth_dev); |
454 | netif_device_attach(local->eth_dev); | 449 | netif_device_attach(local->eth_dev); |
455 | } | 450 | } |