diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-27 06:32:33 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-27 06:32:32 -0700 |
| commit | 3d3db56d8a884abcee8dfda1124a68a19d18c345 (patch) | |
| tree | a589d125fc60d52694d3d5b41a20cd57b0c2d60b | |
| parent | 00823f13c1d751394f2f3c44756c4f3dbd93027e (diff) | |
| parent | e5c576964b29163d66af27b8e8e5856c8c9960e3 (diff) | |
Merge "icnss: Add state check before calling wlan suspend/resume"
| -rw-r--r-- | drivers/soc/qcom/icnss.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/soc/qcom/icnss.c b/drivers/soc/qcom/icnss.c index 883f23d8234d..982d615e1c87 100644 --- a/drivers/soc/qcom/icnss.c +++ b/drivers/soc/qcom/icnss.c @@ -2487,11 +2487,11 @@ static int icnss_suspend(struct platform_device *pdev, icnss_pr_dbg("Driver suspending, state: 0x%lx\n", penv->state); - if (!penv->ops) + if (!penv->ops || !penv->ops->suspend || + !test_bit(ICNSS_DRIVER_PROBED, &penv->state)) goto out; - if (penv->ops->suspend) - ret = penv->ops->suspend(&pdev->dev, state); + ret = penv->ops->suspend(&pdev->dev, state); out: if (ret == 0) @@ -2511,11 +2511,11 @@ static int icnss_resume(struct platform_device *pdev) icnss_pr_dbg("Driver resuming, state: 0x%lx\n", penv->state); - if (!penv->ops) + if (!penv->ops || !penv->ops->resume || + !test_bit(ICNSS_DRIVER_PROBED, &penv->state)) goto out; - if (penv->ops->resume) - ret = penv->ops->resume(&pdev->dev); + ret = penv->ops->resume(&pdev->dev); out: if (ret == 0) |