|
@@ -6659,19 +6659,20 @@ int rt2800_enable_radio(struct rt2x00_dev *rt2x00dev)
|
|
|
rt2800_init_registers(rt2x00dev)))
|
|
|
return -EIO;
|
|
|
|
|
|
+ if (unlikely(rt2800_wait_bbp_rf_ready(rt2x00dev)))
|
|
|
+ return -EIO;
|
|
|
+
|
|
|
/*
|
|
|
* Send signal to firmware during boot time.
|
|
|
*/
|
|
|
rt2800_register_write(rt2x00dev, H2M_BBP_AGENT, 0);
|
|
|
rt2800_register_write(rt2x00dev, H2M_MAILBOX_CSR, 0);
|
|
|
- if (rt2x00_is_usb(rt2x00dev)) {
|
|
|
+ if (rt2x00_is_usb(rt2x00dev))
|
|
|
rt2800_register_write(rt2x00dev, H2M_INT_SRC, 0);
|
|
|
- rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
|
|
|
- }
|
|
|
+ rt2800_mcu_request(rt2x00dev, MCU_BOOT_SIGNAL, 0, 0, 0);
|
|
|
msleep(1);
|
|
|
|
|
|
- if (unlikely(rt2800_wait_bbp_rf_ready(rt2x00dev) ||
|
|
|
- rt2800_wait_bbp_ready(rt2x00dev)))
|
|
|
+ if (unlikely(rt2800_wait_bbp_ready(rt2x00dev)))
|
|
|
return -EIO;
|
|
|
|
|
|
rt2800_init_bbp(rt2x00dev);
|