Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / drivers / net / wireless / hostap / hostap_cs.c

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 80039a0ae0276c6514978dd2d945bfc284520447..3b4e55cf33cd4a071b57a35144b4a3aa3b6883af 100644 (file)
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -777,8 +777,10 @@ static int hostap_cs_suspend(struct pcmcia_device *link)
        int dev_open = 0;
        struct hostap_interface *iface = NULL;
 
-       if (dev)
-               iface = netdev_priv(dev);
+       if (!dev)
+               return -ENODEV;
+
+       iface = netdev_priv(dev);
 
        PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
        if (iface && iface->local)
@@ -798,8 +800,10 @@ static int hostap_cs_resume(struct pcmcia_device *link)
        int dev_open = 0;
        struct hostap_interface *iface = NULL;
 
-       if (dev)
-               iface = netdev_priv(dev);
+       if (!dev)
+               return -ENODEV;
+
+       iface = netdev_priv(dev);
 
        PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);