aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/hostap
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/hostap')
-rw-r--r--drivers/net/wireless/hostap/hostap_cs.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 7a1023f3875b..0fb625185452 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -816,8 +816,6 @@ static int hostap_cs_suspend(struct pcmcia_device *p_dev)
816 816
817 PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info); 817 PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
818 818
819 link->state |= DEV_SUSPEND;
820
821 if (link->state & DEV_CONFIG) { 819 if (link->state & DEV_CONFIG) {
822 struct hostap_interface *iface = netdev_priv(dev); 820 struct hostap_interface *iface = netdev_priv(dev);
823 if (iface && iface->local) 821 if (iface && iface->local)
@@ -827,7 +825,6 @@ static int hostap_cs_suspend(struct pcmcia_device *p_dev)
827 netif_device_detach(dev); 825 netif_device_detach(dev);
828 } 826 }
829 prism2_suspend(dev); 827 prism2_suspend(dev);
830 pcmcia_release_configuration(link->handle);
831 } 828 }
832 829
833 return 0; 830 return 0;
@@ -841,14 +838,11 @@ static int hostap_cs_resume(struct pcmcia_device *p_dev)
841 838
842 PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info); 839 PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);
843 840
844 link->state &= ~DEV_SUSPEND;
845 if (link->state & DEV_CONFIG) { 841 if (link->state & DEV_CONFIG) {
846 struct hostap_interface *iface = netdev_priv(dev); 842 struct hostap_interface *iface = netdev_priv(dev);
847 if (iface && iface->local) 843 if (iface && iface->local)
848 dev_open = iface->local->num_dev_open > 0; 844 dev_open = iface->local->num_dev_open > 0;
849 845
850 pcmcia_request_configuration(link->handle, &link->conf);
851
852 prism2_hw_shutdown(dev, 1); 846 prism2_hw_shutdown(dev, 1);
853 prism2_hw_config(dev, dev_open ? 0 : 1); 847 prism2_hw_config(dev, dev_open ? 0 : 1);
854 if (dev_open) { 848 if (dev_open) {