2 files changed, 10 insertions, 1 deletions

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 8c24cd72aaca..6c7db9a1a466 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -4326,6 +4326,14 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
                 err = -EOPNOTSUPP;
                 goto err_powerdown;
         }
+        if (1 /* disable A-PHY */) {
+                /* FIXME: For now we disable the A-PHY on multi-PHY devices. */
+                if (dev->phy.type != B43_PHYTYPE_N) {
+                        have_2ghz_phy = 1;
+                        have_5ghz_phy = 0;
+                }
+        }
+
         dev->phy.gmode = have_2ghz_phy;
         tmp = dev->phy.gmode ? B43_TMSLOW_GMODE : 0;
         b43_wireless_core_reset(dev, tmp);
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 1a409fcc80d3..d448c9702a0f 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -298,7 +298,8 @@ static int lbs_do_scan(struct lbs_private *priv, uint8_t bsstype,
         uint8_t *tlv;   /* pointer into our current, growing TLV storage area */
 
         lbs_deb_enter_args(LBS_DEB_SCAN, "bsstype %d, chanlist[].chan %d, chan_count %d",
-                           bsstype, chan_list[0].channumber, chan_count);
+                bsstype, chan_list ? chan_list[0].channumber : -1,
+                chan_count);
 
         /* create the fixed part for scan command */
         scan_cmd = kzalloc(MAX_SCAN_CFG_ALLOC, GFP_KERNEL);