rtlwifi: rtl8723be: Fix smatch warnings

Smatch reports the following:

drivers/net/wireless/rtlwifi/rtl8723be/fw.c:208 _rtl8723be_fill_h2c_command() warn: variable dereferenced before check 'rtlhal' (see line 69)
drivers/net/wireless/rtlwifi/rtl8723be/hw.c:1732 _rtl8723be_read_adapter_info() error: __builtin_memcpy() '&rtlefuse->efuse_map[0][0]' too small (256 vs 512)

The first one is fixed by removing two pointless tests for NULL pointers.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/fw.c b/drivers/net/wireless/rtlwifi/rtl8723be/fw.c
index 0f3522db5b3725ab4853337d0a4859488232e4ec..f856be6fc1386533e389b39a9841a463225f5425 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8723be/fw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/fw.c
@@ -201,14 +201,6 @@ static void _rtl8723be_fill_h2c_command(struct ieee80211_hw *hw, u8 element_id,
                         "pHalData->last_hmeboxnum  = %d\n",
                         rtlhal->last_hmeboxnum);
        }
-       if (!rtlpriv) {
-               pr_err("rtlpriv bad\n");
-               return;
-       }
-       if (!rtlhal) {
-               pr_err("rtlhal bad\n");
-               return;
-       }
        spin_lock_irqsave(&rtlpriv->locks.h2c_lock, flag);
        rtlhal->h2c_setinprogress = false;
        spin_unlock_irqrestore(&rtlpriv->locks.h2c_lock, flag);

diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index 0b4d641bf715db3bbb6bf724412cf64ee2ce42d4..6965afdf572a9d57c06fabd8b070fbc8cc58b9ce 100644 (file)
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -1587,7 +1587,7 @@ struct rtl_dm {
        u64 last_rx_ok_cnt;
 };
 
-#define        EFUSE_MAX_LOGICAL_SIZE                  256
+#define        EFUSE_MAX_LOGICAL_SIZE                  512
 
 struct rtl_efuse {
        bool autoLoad_ok;