diff options
| author | Josh Wu <josh.wu@atmel.com> | 2015-05-26 06:54:45 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-07-06 08:25:51 -0300 |
| commit | 8c0378354709058bba3319bb58fd04bd09e1eaa6 (patch) | |
| tree | 87c78fc7814712432dc3a616aacc43b4efa978d2 /drivers/media/platform | |
| parent | 408131b85509902b100f7045484c7377a40be99d (diff) | |
| download | linux-8c0378354709058bba3319bb58fd04bd09e1eaa6.tar.bz2 | |
[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>
Diffstat (limited to 'drivers/media/platform')
| -rw-r--r-- | drivers/media/platform/soc_camera/atmel-isi.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c index 287902681164..22270225b202 100644 --- 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, |