summaryrefslogtreecommitdiff
path: root/drivers/soc
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2018-02-15 12:21:05 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2018-02-15 12:21:04 -0800
commit38edeeedb5505a5d6148b8022ca2a5f9f3f4e5f6 (patch)
treedb87dbd74ee26b5b8b933535ceb80e918a46ce13 /drivers/soc
parent26f01d728e6519d9d72706f2601ac6326edb7fd8 (diff)
parent00d56be680058b861336998686d5127695dcf42f (diff)
Merge "icnss: Remove vote for hardware resources when FW is not down"
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/qcom/icnss.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/soc/qcom/icnss.c b/drivers/soc/qcom/icnss.c
index 176b87366a4c..848328a1a4ea 100644
--- a/drivers/soc/qcom/icnss.c
+++ b/drivers/soc/qcom/icnss.c
@@ -1132,6 +1132,9 @@ static int icnss_hw_power_off(struct icnss_priv *priv)
if (test_bit(HW_ALWAYS_ON, &quirks))
return 0;
+ if (test_bit(ICNSS_FW_DOWN, &priv->state))
+ return 0;
+
icnss_pr_dbg("HW Power off: 0x%lx\n", priv->state);
spin_lock(&priv->on_off_lock);