msm: peripheral-reset-8960: Don't touch regulators for failed shutdowns
Abort the shutdown (and skip disabling regulators) if the SCM
call to do a secure Q6 shutdown fails.
Signed-off-by: Matt Wagantall <mattw@codeaurora.org>
diff --git a/arch/arm/mach-msm/peripheral-reset-8960.c b/arch/arm/mach-msm/peripheral-reset-8960.c
index ecb9412..1a4bc12 100644
--- a/arch/arm/mach-msm/peripheral-reset-8960.c
+++ b/arch/arm/mach-msm/peripheral-reset-8960.c
@@ -470,6 +470,9 @@
int ret;
ret = shutdown_trusted(id);
+ if (ret)
+ return ret;
+
if (q6->vreg_enabled) {
regulator_disable(q6->vreg);
q6->vreg_enabled = false;