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

Commit 8c037835 authored by Josh Wu's avatar Josh Wu Committed by Mauro Carvalho Chehab
Browse files

[media] atmel-isi: disable ISI even if it has codec request 



In current code, stop_streaming() will just return if ISI is still
working in the codec. But this is incorrect, we need to disable ISI even
it is working on the codec, otherwise stop_streaming() will not work as
we expected.

Signed-off-by: default avatarJosh Wu <josh.wu@atmel.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 408131b8

drivers/media/platform/soc_camera/atmel-isi.c

+1 −3
Original line number Diff line number Diff line
@@ -431,11 +431,9 @@ static void stop_streaming(struct vb2_queue *vq) 
			time_before(jiffies, timeout))

		msleep(1);



	if (time_after(jiffies, timeout)) {

	if (time_after(jiffies, timeout))

		dev_err(icd->parent,

			"Timeout waiting for finishing codec request\n");

		return;

	}



	/* Disable interrupts */

	isi_writel(isi, ISI_INTDIS,