Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1bee1edf authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: crm: Use del_timer_sync to delete the timer" into dev/msm-4.9-camx

parents 00f1431b 4622d1a6

drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ void crm_timer_exit(struct cam_req_mgr_timer **crm_timer) 
{

	CAM_DBG(CAM_CRM, "destroy timer %pK", *crm_timer);

	if (*crm_timer) {

		del_timer(&(*crm_timer)->sys_timer);

		del_timer_sync(&(*crm_timer)->sys_timer);

		kfree(*crm_timer);

		*crm_timer = NULL;

	}