From: Alexandre Kroupski <alexandre.kroup...@ingenico.com>

In case of sensor malfunction, stop streaming timeout takes much longer
than expected.
This is due to conversion of time to jiffies: milliseconds multiplied
with HZ (ticks/second) gives out a value of jiffies with 10^3 greater.
We need to also divide by 10^3 to obtain the right jiffies value.
In other words FRAME_INTERVAL_MILLI_SEC must be in seconds in order to multiply
by HZ and get the right jiffies value to add to the current jiffies for the
timeout expire time.

Fixes: 195ebc43bf76 ("[media] V4L: at91: add Atmel Image Sensor Interface (ISI) 
support")
Signed-off-by: Alexandre Kroupski <alexandre.kroup...@ingenico.com>
Reviewed-by: Eugen Hristev <eugen.hris...@microchip.com>
---
 drivers/media/platform/atmel/atmel-isi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/platform/atmel/atmel-isi.c 
b/drivers/media/platform/atmel/atmel-isi.c
index d7d94c1..428f117 100644
--- a/drivers/media/platform/atmel/atmel-isi.c
+++ b/drivers/media/platform/atmel/atmel-isi.c
@@ -493,7 +493,7 @@ static void stop_streaming(struct vb2_queue *vq)
        spin_unlock_irq(&isi->irqlock);
 
        if (!isi->enable_preview_path) {
-               timeout = jiffies + FRAME_INTERVAL_MILLI_SEC * HZ;
+               timeout = jiffies + (FRAME_INTERVAL_MILLI_SEC * HZ) / 1000;
                /* Wait until the end of the current frame. */
                while ((isi_readl(isi, ISI_STATUS) & ISI_CTRL_CDC) &&
                                time_before(jiffies, timeout))
-- 
2.7.4

Reply via email to