Merge branch 'for_3.8-rc1' into v4l_for_linus

[deliverable/linux.git] / drivers / media / platform / exynos-gsc / gsc-m2m.c

diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
index c065d040ed944630b9d3a4b569fcfc0c5db5f4f4..c267c57c76fdeec23c6fb51c0609929f630c0e91 100644 (file)
--- a/drivers/media/platform/exynos-gsc/gsc-m2m.c
+++ b/drivers/media/platform/exynos-gsc/gsc-m2m.c
@@ -122,7 +122,7 @@ static void gsc_m2m_device_run(void *priv)
        struct gsc_ctx *ctx = priv;
        struct gsc_dev *gsc;
        unsigned long flags;
-       u32 ret;
+       int ret;
        bool is_set = false;
 
        if (WARN(!ctx, "null hardware context\n"))