Merge remote-tracking branch 'trivial/for-next'

[karo-tx-linux.git] / drivers / media / platform / exynos4-is / fimc-is.c

diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c
index 979c388ebf60cdd1a497aac2570aab05c5e800a6..bf2a54e7e47022325f799fc5378fefff04cec126 100644 (file)
--- a/drivers/media/platform/exynos4-is/fimc-is.c
+++ b/drivers/media/platform/exynos4-is/fimc-is.c
@@ -297,10 +297,10 @@ int fimc_is_wait_event(struct fimc_is *is, unsigned long bit,
        int ret = wait_event_timeout(is->irq_queue,
                                     !state ^ test_bit(bit, &is->state),
                                     timeout);
-       if (ret == 0) {
-               dev_WARN(&is->pdev->dev, "%s() timed out\n", __func__);
+
+       if (dev_WARN(&is->pdev->dev, ret == 0, "%s() timed out\n", __func__))
                return -ETIME;
-       }
+
        return 0;
 }