drivers/staging/brcm80211: Fix for suspend/resume bug

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

 /*
  * Copyright (c) 2010 Broadcom Corporation
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
@@ skipping 2070 matching lines @@
 
         /*
          * Save the dhd_info into the priv
          */
         memcpy(netdev_priv(net), &dhd, sizeof(dhd));
 
 #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
         g_bus = bus;
 #endif
 #if defined(CONFIG_PM_SLEEP)
-        register_pm_notifier(&dhd_sleep_pm_notifier);
+        if (!IS_CFG80211_FAVORITE())

[ggg, 2011/04/07 20:28:58]

#define FAVORITE_WIFI_CP (!!dhd_cfg80211)
#define IS_CFG80211_FAVORITE() FAVORITE_WIFI_CP

I expect IS_CFG80211_FAVORITE, FAVORITE_WIFI_CP, and dhd_cfg80211 all need to be
removed before this driver can move out of staging-2.6 tree.

+        {
+                register_pm_notifier(&dhd_sleep_pm_notifier);
+        }
 #endif  /* defined(CONFIG_PM_SLEEP) */
         /* && defined(DHD_GPL) */
         /* Init lock suspend to prevent kernel going to suspend */
 #ifdef CONFIG_HAS_EARLYSUSPEND
         dhd->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN + 20;
         dhd->early_suspend.suspend = dhd_early_suspend;
         dhd->early_suspend.resume = dhd_late_resume;
         register_early_suspend(&dhd->early_suspend);
 #endif
 
@@ skipping 285 matching lines @@
                                 dhd_prot_detach(dhdp);
 
 #if defined(CONFIG_WIRELESS_EXT)
                         wl_iw_detach();
 #endif                          /* (CONFIG_WIRELESS_EXT) */
 
                         if (IS_CFG80211_FAVORITE())
                                 wl_cfg80211_detach();
 
 #if defined(CONFIG_PM_SLEEP)
-                        unregister_pm_notifier(&dhd_sleep_pm_notifier);
+                        if (!IS_CFG80211_FAVORITE())
+                        {
+                                unregister_pm_notifier(&dhd_sleep_pm_notifier);
+                        }
 #endif  /* defined(CONFIG_PM_SLEEP) */
                         /* && defined(DHD_GPL) */
                         free_netdev(ifp->net);
                         kfree(ifp);
                         kfree(dhd);
                 }
         }
 }
 
 static void __exit dhd_module_cleanup(void)
@@ skipping 540 matching lines @@
         kfree(buf);
         /* close file before return */
         if (fp)
                 filp_close(fp, current->files);
         /* restore previous address limit */
         set_fs(old_fs);
 
         return ret;
 }
 #endif                          /* DHD_DEBUG */