mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
staging/rtl8821ae: Fix OOM handling in _rtl_init_deferred_work()
alloc_workqueue() can fail, handle this case. Signed-off-by: Richard Weinberger <richard@nod.at> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
c9eaa447e7
commit
29d1e7209e
1 changed files with 8 additions and 2 deletions
|
@ -388,7 +388,7 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw)
|
|||
|
||||
}
|
||||
|
||||
static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
|
||||
static int _rtl_init_deferred_work(struct ieee80211_hw *hw)
|
||||
{
|
||||
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
||||
|
||||
|
@ -410,6 +410,9 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
|
|||
rtlpriv->works.rtl_wq = create_workqueue(rtlpriv->cfg->name);
|
||||
#endif
|
||||
/*<delete in kernel end>*/
|
||||
if (!rtlpriv->works.rtl_wq)
|
||||
return -ENOMEM;
|
||||
|
||||
INIT_DELAYED_WORK(&rtlpriv->works.watchdog_wq,
|
||||
(void *)rtl_watchdog_wq_callback);
|
||||
INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq,
|
||||
|
@ -421,6 +424,8 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw)
|
|||
INIT_DELAYED_WORK(&rtlpriv->works.fwevt_wq,
|
||||
(void *)rtl_fwevt_wq_callback);
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
|
||||
void rtl_deinit_deferred_work(struct ieee80211_hw *hw)
|
||||
|
@ -519,7 +524,8 @@ int rtl_init_core(struct ieee80211_hw *hw)
|
|||
INIT_LIST_HEAD(&rtlpriv->entry_list);
|
||||
|
||||
/* <6> init deferred work */
|
||||
_rtl_init_deferred_work(hw);
|
||||
if (_rtl_init_deferred_work(hw))
|
||||
return 1;
|
||||
|
||||
/* <7> */
|
||||
#ifdef VIF_TODO
|
||||
|
|
Loading…
Reference in a new issue