[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: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 287902681164ff5fa12d5952a1d08800c6c79aa0..22270225b202bf3942241955956c033838bdbf0e 100644 (file)
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -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,