diff options
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/ath/wil6210/pm.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/drivers/net/wireless/ath/wil6210/pm.c b/drivers/net/wireless/ath/wil6210/pm.c index 015dc3c1493f..b4faf8212348 100644 --- a/drivers/net/wireless/ath/wil6210/pm.c +++ b/drivers/net/wireless/ath/wil6210/pm.c @@ -80,6 +80,8 @@ static int wil_resume_keep_radio_on(struct wil6210_priv *wil) wil_c(wil, RGF_USER_CLKS_CTL_0, BIT_USER_CLKS_RST_PWGD); wil_unmask_irq(wil); + wil6210_bus_request(wil, wil->bus_request_kbps_pre_suspend); + /* Send WMI resume request to the device */ rc = wmi_resume(wil); if (rc) { @@ -96,8 +98,6 @@ static int wil_resume_keep_radio_on(struct wil6210_priv *wil) } } - wil6210_bus_request(wil, wil->bus_request_kbps_pre_suspend); - out: if (rc) set_bit(wil_status_suspended, wil->status); @@ -175,38 +175,35 @@ static int wil_suspend_keep_radio_on(struct wil6210_priv *wil) /* Disable device reset on PERST */ wil_s(wil, RGF_USER_CLKS_CTL_0, BIT_USER_CLKS_RST_PWGD); - /* Save the current bus request to return to the same in resume */ - wil->bus_request_kbps_pre_suspend = wil->bus_request_kbps; - wil6210_bus_request(wil, 0); - if (wil->platform_ops.suspend) { rc = wil->platform_ops.suspend(wil->platform_handle, true); if (rc) { wil_err(wil, "platform device failed to suspend (%d)\n", rc); wil->suspend_stats.failed_suspends++; - clear_bit(wil_status_suspending, wil->status); - rc = wil_resume_keep_radio_on(wil); - /* if resume succeeded, reject the suspend */ - if (!rc) - rc = -EBUSY; - goto out; + wil_c(wil, RGF_USER_CLKS_CTL_0, BIT_USER_CLKS_RST_PWGD); + wil_unmask_irq(wil); + goto resume_after_fail; } } + /* Save the current bus request to return to the same in resume */ + wil->bus_request_kbps_pre_suspend = wil->bus_request_kbps; + wil6210_bus_request(wil, 0); + set_bit(wil_status_suspended, wil->status); clear_bit(wil_status_suspending, wil->status); return rc; resume_after_fail: + set_bit(wil_status_resuming, wil->status); clear_bit(wil_status_suspending, wil->status); rc = wmi_resume(wil); /* if resume succeeded, reject the suspend */ if (!rc) rc = -EBUSY; -out: return rc; reject_suspend: |