1 files changed, 5 insertions, 13 deletions

diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 9b9c0f19b21c..c34547c79245 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -464,12 +464,8 @@ static int axnet_suspend(struct pcmcia_device *p_dev)
         dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                if (link->open)
+        if ((link->state & DEV_CONFIG) && (link->open))
                         netif_device_detach(dev);
-                pcmcia_release_configuration(link->handle);
-        }
 
         return 0;
 }
@@ -479,14 +475,10 @@ static int axnet_resume(struct pcmcia_device *p_dev)
         dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        link->state &= ~DEV_SUSPEND;
-        if (link->state & DEV_CONFIG) {
-                pcmcia_request_configuration(link->handle, &link->conf);
-                if (link->open) {
-                        axnet_reset_8390(dev);
-                        AX88190_init(dev, 1);
-                        netif_device_attach(dev);
-                }
+        if ((link->state & DEV_CONFIG) && (link->open)) {
+                axnet_reset_8390(dev);
+                AX88190_init(dev, 1);
+                netif_device_attach(dev);
         }
 
         return 0;