diff --git a/[refs] b/[refs]
index d06f06fe6a26..cc0bca957d2f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: adc40e9796d03d56e99bdac62492492a1098124b
+refs/heads/master: ec483781fe98bba92e00f4428f8d69dd5e071246
diff --git a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
index 2b7ef9b46ccd..c37371fc9e01 100644
--- a/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
+++ b/trunk/drivers/net/wireless/bcm43xx/bcm43xx_main.c
@@ -3530,12 +3530,18 @@ static void bcm43xx_ieee80211_set_chan(struct net_device *net_dev,
 				       u8 channel)
 {
 	struct bcm43xx_private *bcm = bcm43xx_priv(net_dev);
+	struct bcm43xx_radioinfo *radio;
 	unsigned long flags;
 
 	bcm43xx_lock_mmio(bcm, flags);
-	bcm43xx_mac_suspend(bcm);
-	bcm43xx_radio_selectchannel(bcm, channel, 0);
-	bcm43xx_mac_enable(bcm);
+	if (bcm->initialized) {
+		bcm43xx_mac_suspend(bcm);
+		bcm43xx_radio_selectchannel(bcm, channel, 0);
+		bcm43xx_mac_enable(bcm);
+	} else {
+		radio = bcm43xx_current_radio(bcm);
+		radio->initial_channel = channel;
+	}
 	bcm43xx_unlock_mmio(bcm, flags);
 }