summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-10-31 06:59:16 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-31 06:59:16 -0700
commit015c20d6be498433ab180a8aed1eca3c53936c8b (patch)
treea2f3f22390a9091ac2a905690579ddec1af8c8bb
parentc0961b67cce19466a1e678e58f9f51819fed74e0 (diff)
parent3547f54f46e568435af1a6ab0a09970ab1c606f6 (diff)
Merge "icnss: Shutdown Adrastea before remapping MSA0"
-rw-r--r--drivers/soc/qcom/icnss.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/soc/qcom/icnss.c b/drivers/soc/qcom/icnss.c
index 7a04233a7e82..feeed645fc47 100644
--- a/drivers/soc/qcom/icnss.c
+++ b/drivers/soc/qcom/icnss.c
@@ -2655,10 +2655,10 @@ static int icnss_driver_event_pd_service_down(struct icnss_priv *priv,
icnss_call_driver_remove(priv);
out:
- icnss_remove_msa_permissions(priv);
-
ret = icnss_hw_power_off(priv);
+ icnss_remove_msa_permissions(priv);
+
kfree(data);
return ret;