Changeset 18879 for src/linux/universal/linux-3.3/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c

Timestamp:

03/31/12 01:43:19 (14 months ago)

Author:

BrainSlayer

Message:

update kernels

File:

• src/linux/universal/linux-3.3/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c (modified) (2 diffs)

src/linux/universal/linux-3.3/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c

@@ -1172 +1172 @@
                          ("Failed to download FW. Init HW without FW now..\n"));
                 err = 1;
-                rtlhal->fw_ready = false;
                 return err;
-        } else {
-                rtlhal->fw_ready = true;
         }
         rtlhal->last_hmeboxnum = 0; /* h2c */
@@ -1271 +1268 @@
                         /* reset MCU ready status */
                         rtl_write_byte(rtlpriv, REG_MCUFWDL, 0);
-                        if (rtlhal->fw_ready) {
-                                /* 8051 reset by self */
-                                rtl_write_byte(rtlpriv, REG_HMETFR+3, 0x20);
-                                while ((retry_cnts++ < 100) &&
-                                       (FEN_CPUEN & rtl_read_word(rtlpriv,
-                                       REG_SYS_FUNC_EN))) {
-                                        udelay(50);
-                                }
-                                if (retry_cnts >= 100) {
-                                        RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+                        /* 8051 reset by self */
+                        rtl_write_byte(rtlpriv, REG_HMETFR+3, 0x20);
+                        while ((retry_cnts++ < 100) &&
+                               (FEN_CPUEN & rtl_read_word(rtlpriv,
+                               REG_SYS_FUNC_EN))) {
+                                udelay(50);
+                        }
+                        if (retry_cnts >= 100) {
+                                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                                                 ("#####=> 8051 reset failed!.."
                                                 ".......................\n"););
-                                        /* if 8051 reset fail, reset MAC. */
-                                        rtl_write_byte(rtlpriv,
-                                                       REG_SYS_FUNC_EN + 1,
-                                                       0x50);
-                                        udelay(100);
-                                }
+                                /* if 8051 reset fail, reset MAC. */
+                                rtl_write_byte(rtlpriv,
+                                               REG_SYS_FUNC_EN + 1,
+                                               0x50);
+                                udelay(100);
                         }
                 }