ENGR00285273-1 IPU dev:Correct timeout setting from users

This patch corrects the logic to set timeout value specified
by the users.

Signed-off-by: Liu Ying <Ying.Liu@freescale.com>

diff --git a/drivers/mxc/ipu3/ipu_device.c b/drivers/mxc/ipu3/ipu_device.c
index 6781582a47c7c2cd873bd5c70bdf0d29d7f20b9d..1df0005d864a3a59c770b00366ed528e4008a2d5 100644 (file)
--- a/drivers/mxc/ipu3/ipu_device.c
+++ b/drivers/mxc/ipu3/ipu_device.c
@@ -1403,7 +1403,7 @@ static struct ipu_task_entry *create_task_entry(struct ipu_task *task)
        tsk->overlay_en = task->overlay_en;
        if (tsk->overlay_en)
                tsk->overlay = task->overlay;
-       if (tsk->timeout && (tsk->timeout > DEF_TIMEOUT_MS))
+       if (task->timeout > DEF_TIMEOUT_MS)
                tsk->timeout = task->timeout;
        else
                tsk->timeout = DEF_TIMEOUT_MS;