diff options
| author |   Stefan Schmidt <stefan@datenfreihafen.org> | 2018-08-06 09:04:48 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2018-08-06 09:04:48 +0200 |
| commit | a30461080366214b690a367225a48c95d7a6a189 (patch) | |
| tree | 02cd7cfb8cea14cebe1ab2a1638edd8c9b9e0d3f /drivers/net/wireless/ti/wlcore/sysfs.c | |
| parent | ieee802154: add rx LQI from userspace (diff) | |
| parent | tc-testing: remove duplicate spaces in skbedit match patterns (diff) | |
| download | linux-dev-a30461080366214b690a367225a48c95d7a6a189.tar.xz linux-dev-a30461080366214b690a367225a48c95d7a6a189.zip | |
Merge remote-tracking branch 'net-next/master'
Diffstat (limited to 'drivers/net/wireless/ti/wlcore/sysfs.c')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/sysfs.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/wireless/ti/wlcore/sysfs.c b/drivers/net/wireless/ti/wlcore/sysfs.c index d31eb775e023..7425ba9471d0 100644 --- a/drivers/net/wireless/ti/wlcore/sysfs.c +++ b/drivers/net/wireless/ti/wlcore/sysfs.c @@ -19,9 +19,11 @@ * */ +#include <linux/pm_runtime.h> + +#include "acx.h" #include "wlcore.h" #include "debug.h" -#include "ps.h" #include "sysfs.h" static ssize_t wl1271_sysfs_show_bt_coex_state(struct device *dev, @@ -68,12 +70,15 @@ static ssize_t wl1271_sysfs_store_bt_coex_state(struct device *dev, if (unlikely(wl->state != WLCORE_STATE_ON)) goto out; - ret = wl1271_ps_elp_wakeup(wl); - if (ret < 0) + ret = pm_runtime_get_sync(wl->dev); + if (ret < 0) { + pm_runtime_put_noidle(wl->dev); goto out; + } wl1271_acx_sg_enable(wl, wl->sg_enabled); - wl1271_ps_elp_sleep(wl); + pm_runtime_mark_last_busy(wl->dev); + pm_runtime_put_autosuspend(wl->dev); out: mutex_unlock(&wl->mutex); |