Merge "wcnss: Invoke panic when WCNSS crashes." into msm-3.0
diff --git a/arch/arm/mach-msm/wcnss-ssr-8960.c b/arch/arm/mach-msm/wcnss-ssr-8960.c
index 954b925..2ef5c61 100644
--- a/arch/arm/mach-msm/wcnss-ssr-8960.c
+++ b/arch/arm/mach-msm/wcnss-ssr-8960.c
@@ -38,8 +38,7 @@
static void riva_smsm_cb_fn(struct work_struct *work)
{
- pr_err("%s: Initiating subsytem restart\n", MODULE_NAME);
- subsystem_restart("riva");
+ panic(MODULE_NAME ": SMSM reset request received from Riva");
}
static void smsm_state_cb_hdlr(void *data, uint32_t old_state,
@@ -59,9 +58,8 @@
static void riva_fatal_fn(struct work_struct *work)
{
- pr_err("%s: Watchdog bite received from Riva\n", MODULE_NAME);
if (!ss_restart_inprogress)
- subsystem_restart("riva");
+ panic(MODULE_NAME ": Watchdog bite received from Riva");
}
/* SMSM reset Riva */