From: Jiyoung Jeong <ji_0.jeong@samsung.com>
Date: Wed, 9 Jan 2019 06:51:12 +0000 (+0900)
Subject: [RAMEN9610-10585][COMMON][MODAP-14406] Modified del_timer to be excuted only when
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fbab3eab04ad28d3f75d1fbcccd9207e0adcc3f5;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[RAMEN9610-10585][COMMON][MODAP-14406] Modified del_timer to be excuted only when

init_timer was called

Change-Id: If5bc09dcec8f1bd2c0f74f66c4975f5d7883297a
Signed-off-by: Jiyoung Jeong <ji_0.jeong@samsung.com>
---

diff --git a/drivers/misc/modem_if/modem_link_device_shmem.c b/drivers/misc/modem_if/modem_link_device_shmem.c
index 013928b1a2e2..e334f0a488e6 100644
--- a/drivers/misc/modem_if/modem_link_device_shmem.c
+++ b/drivers/misc/modem_if/modem_link_device_shmem.c
@@ -477,7 +477,8 @@ static void cmd_crash_exit_handler(struct shmem_link_device *shmd)
 
 	ld->mode = LINK_MODE_ULOAD;
 
-	del_timer(&shmd->crash_ack_timer);
+	if (timer_pending(&shmd->crash_ack_timer))
+		del_timer(&shmd->crash_ack_timer);
 
 	if (!wake_lock_active(&shmd->wlock))
 		wake_lock(&shmd->wlock);