3 files changed, 15 insertions, 0 deletions

diff --git a/drivers/net/wireless/b43/debugfs.c b/drivers/net/wireless/b43/debugfs.c
index 24854c3e89cd..29851bc1101f 100644
--- a/drivers/net/wireless/b43/debugfs.c
+++ b/drivers/net/wireless/b43/debugfs.c
@@ -801,6 +801,7 @@ static void b43_add_dynamic_debug(struct b43_wldev *dev)
         add_dyn_dbg("debug_pwork_fast", B43_DBG_PWORK_FAST, 0);
         add_dyn_dbg("debug_pwork_stop", B43_DBG_PWORK_STOP, 0);
         add_dyn_dbg("debug_lo", B43_DBG_LO, 0);
+        add_dyn_dbg("debug_firmware", B43_DBG_FIRMWARE, 0);
 
 #undef add_dyn_dbg
 }
diff --git a/drivers/net/wireless/b43/debugfs.h b/drivers/net/wireless/b43/debugfs.h
index 132c81f2f98d..22ffd02ba554 100644
--- a/drivers/net/wireless/b43/debugfs.h
+++ b/drivers/net/wireless/b43/debugfs.h
@@ -11,6 +11,7 @@ enum b43_dyndbg {		/* Dynamic debugging features */
         B43_DBG_PWORK_FAST,
         B43_DBG_PWORK_STOP,
         B43_DBG_LO,
+        B43_DBG_FIRMWARE,
         __B43_NR_DYNDBG,
 };
 
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index c14d522d69e3..82cca19137f4 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -2487,6 +2487,19 @@ static void b43_gpio_cleanup(struct b43_wldev *dev)
 /* http://bcm-specs.sipsolutions.net/EnableMac */
 void b43_mac_enable(struct b43_wldev *dev)
 {
+        if (b43_debug(dev, B43_DBG_FIRMWARE)) {
+                u16 fwstate;
+
+                fwstate = b43_shm_read16(dev, B43_SHM_SHARED,
+                                         B43_SHM_SH_UCODESTAT);
+                if ((fwstate != B43_SHM_SH_UCODESTAT_SUSP) &&
+                    (fwstate != B43_SHM_SH_UCODESTAT_SLEEP)) {
+                        b43err(dev->wl, "b43_mac_enable(): The firmware "
+                               "should be suspended, but current state is %u\n",
+                               fwstate);
+                }
+        }
+
         dev->mac_suspended--;
         B43_WARN_ON(dev->mac_suspended < 0);
         if (dev->mac_suspended == 0) {