diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-03 10:13:33 -0500 |
| commit | ebc01f593b58e1896150fc2e3cbdd0116323c52c (patch) | |
| tree | 23e905a3fdbee3fc8a66ef760b9ed5ef5455e9dd /drivers/net/wireless/rtlwifi/base.c | |
| parent | 3f7256fe5fc64132a2dd19695255c990aa2188cf (diff) | |
| parent | 0df1f2487d2f0d04703f142813d53615d62a1da4 (diff) | |
Merge tag 'v3.18-rc3' into asoc-sgtl5000
Linux 3.18-rc3
Diffstat (limited to 'drivers/net/wireless/rtlwifi/base.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/base.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index 58ba71830886..40b6d1d006d7 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c | |||
| @@ -467,7 +467,7 @@ static void _rtl_init_deferred_work(struct ieee80211_hw *hw) | |||
| 467 | rtl_easy_concurrent_retrytimer_callback, (unsigned long)hw); | 467 | rtl_easy_concurrent_retrytimer_callback, (unsigned long)hw); |
| 468 | /* <2> work queue */ | 468 | /* <2> work queue */ |
| 469 | rtlpriv->works.hw = hw; | 469 | rtlpriv->works.hw = hw; |
| 470 | rtlpriv->works.rtl_wq = alloc_workqueue(rtlpriv->cfg->name, 0, 0); | 470 | rtlpriv->works.rtl_wq = alloc_workqueue("%s", 0, 0, rtlpriv->cfg->name); |
| 471 | INIT_DELAYED_WORK(&rtlpriv->works.watchdog_wq, | 471 | INIT_DELAYED_WORK(&rtlpriv->works.watchdog_wq, |
| 472 | (void *)rtl_watchdog_wq_callback); | 472 | (void *)rtl_watchdog_wq_callback); |
| 473 | INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq, | 473 | INIT_DELAYED_WORK(&rtlpriv->works.ips_nic_off_wq, |