msm: mdm: Fix for incorrect ramdump timeout and ssr ref count.
The SSR reference count now gets decremented only once during a SSR cycle.
Ramdump timeout is now set correctly for each mdm.
Change-Id: I3f1d577805d4a6cc5171a69107f8529a9d165b04
Signed-off-by: Ameya Thakur <ameyat@codeaurora.org>
diff --git a/arch/arm/mach-msm/mdm_common.c b/arch/arm/mach-msm/mdm_common.c
index 536e859..fcfe564 100644
--- a/arch/arm/mach-msm/mdm_common.c
+++ b/arch/arm/mach-msm/mdm_common.c
@@ -723,7 +723,6 @@
if (!wait_for_completion_timeout(&mdev->mdm_ram_dumps,
msecs_to_jiffies(mdev->dump_timeout_ms))) {
mdm_drv->mdm_ram_dump_status = -ETIMEDOUT;
- mdm_ssr_completed(mdev);
pr_err("%s: mdm modem ramdumps timed out.\n",
__func__);
} else
@@ -887,7 +886,7 @@
mdm_drv->boot_type = CHARM_NORMAL_BOOT;
- mdm_drv->dump_timeout_ms = mdm_drv->pdata->ramdump_timeout_ms > 0 ?
+ mdev->dump_timeout_ms = mdm_drv->pdata->ramdump_timeout_ms > 0 ?
mdm_drv->pdata->ramdump_timeout_ms : MDM_RDUMP_TIMEOUT;
init_completion(&mdev->mdm_needs_reload);
diff --git a/arch/arm/mach-msm/mdm_private.h b/arch/arm/mach-msm/mdm_private.h
index e45f9f6..40525f7 100644
--- a/arch/arm/mach-msm/mdm_private.h
+++ b/arch/arm/mach-msm/mdm_private.h
@@ -51,7 +51,6 @@
int mdm_debug_on;
int mdm_unexpected_reset_occurred;
int disable_status_check;
- unsigned int dump_timeout_ms;
int power_on_count;
int peripheral_status;
struct mutex peripheral_status_lock;