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

drivers/staging/brcm80211/brcmfmac/dhd_linux.c

Index: drivers/staging/brcm80211/brcmfmac/dhd_linux.c
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
index 3efc17a0a4e01421f98ec2864b82e22ed47e5967..e40e2e97a7f22da44f74b4f4bcc354cda18fb71f 100644
--- a/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
@@ -2088,7 +2088,10 @@ dhd_pub_t *dhd_attach(struct osl_info *osh, struct dhd_bus *bus,
 	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 */
@@ -2394,7 +2397,10 @@ void dhd_detach(dhd_pub_t *dhdp)
 				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);