---

yaml
---
r: 290763
b: refs/heads/master
c: 02f1434
h: refs/heads/master
i:
  290761: 1ad3064
  290759: 0125aa6
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 659373d5152705b83283860364bfd4e2b1422f7a
+refs/heads/master: 02f1434d4ed8197cefde6f6c4a8b2f502144cbb5

trunk/drivers/net/wireless/zd1211rw/zd_mac.c

@@ -306,9 +306,19 @@ int zd_op_start(struct ieee80211_hw *hw)
 	r = set_mc_hash(mac);
 	if (r)
 		goto disable_int;
+
+	/* Wait after setting the multicast hash table and powering on
+	 * the radio otherwise interface bring up will fail. This matches
+	 * what the vendor driver did.
+	 */
+	msleep(10);
+
 	r = zd_chip_switch_radio_on(chip);
-	if (r < 0)
+	if (r < 0) {
+		dev_err(zd_chip_dev(chip),
+			"%s: failed to set radio on\n", __func__);
 		goto disable_int;
+	}
 	r = zd_chip_enable_rxtx(chip);
 	if (r < 0)
 		goto disable_radio;