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

Commit 3862f390 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Make ISPIF not interruptable"

parents a83a0066 cb088c27

drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ static int msm_ispif_reset_hw(struct ispif_device *ispif) 
	}



	if (ispif->hw_num_isps > 1) {

		timeout = wait_for_completion_interruptible_timeout(

		timeout = wait_for_completion_timeout(

				&ispif->reset_complete[VFE1],

				msecs_to_jiffies(500));

		CDBG("%s: VFE1 done\n", __func__);