aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rtlwifi/pci.c
diff options
context:
space:
mode:
authorLarry Finger <Larry.Finger@lwfinger.net>2014-09-26 17:40:28 -0400
committerJohn W. Linville <linville@tuxdriver.com>2014-09-30 13:17:38 -0400
commitef09396ef622572c604d4977e76f6151ef68ed21 (patch)
tree3b4d123539b4446455112e4e74b21daa590db100 /drivers/net/wireless/rtlwifi/pci.c
parent557f933113a42a48ec617b81b5ea53fd7202b1ed (diff)
rtlwifi: rtl8188ee: rtl8723ae: rtl8821ae: Initialize some variables
In a number of places, kmalloc or valloc were used to acquire memory. To ensure that these locations are correctly initialized, the calls were changed to kzalloc and vzalloc. The change fixes a problem that was causing HT operations to be cancelled. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/rtlwifi/pci.c')
-rw-r--r--drivers/net/wireless/rtlwifi/pci.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 1dbb22b537ef..667aba81246c 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -2243,16 +2243,6 @@ int rtl_pci_probe(struct pci_dev *pdev,
2243 /*like read eeprom and so on */ 2243 /*like read eeprom and so on */
2244 rtlpriv->cfg->ops->read_eeprom_info(hw); 2244 rtlpriv->cfg->ops->read_eeprom_info(hw);
2245 2245
2246 if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
2247 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
2248 err = -ENODEV;
2249 goto fail3;
2250 }
2251 rtlpriv->cfg->ops->init_sw_leds(hw);
2252
2253 /*aspm */
2254 rtl_pci_init_aspm(hw);
2255
2256 /* Init mac80211 sw */ 2246 /* Init mac80211 sw */
2257 err = rtl_init_core(hw); 2247 err = rtl_init_core(hw);
2258 if (err) { 2248 if (err) {
@@ -2268,6 +2258,16 @@ int rtl_pci_probe(struct pci_dev *pdev,
2268 goto fail3; 2258 goto fail3;
2269 } 2259 }
2270 2260
2261 if (rtlpriv->cfg->ops->init_sw_vars(hw)) {
2262 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, "Can't init_sw_vars\n");
2263 err = -ENODEV;
2264 goto fail3;
2265 }
2266 rtlpriv->cfg->ops->init_sw_leds(hw);
2267
2268 /*aspm */
2269 rtl_pci_init_aspm(hw);
2270
2271 err = ieee80211_register_hw(hw); 2271 err = ieee80211_register_hw(hw);
2272 if (err) { 2272 if (err) {
2273 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG, 2273 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,