From 1cf43ea43c7ba01570138d03efeaa5e844ee3d97 Mon Sep 17 00:00:00 2001 From: Shaik Ameer Basha Date: Tue, 16 Oct 2012 09:38:34 -0300 Subject: [PATCH] --- yaml --- r: 343780 b: refs/heads/master c: 4bd0e030aadaba4a0e8fd5c0233d7e61f2e6207d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/exynos-gsc/gsc-m2m.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4a80e8976072..1f2e73c0e3dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 840354381127fe1097a332bb3e56a1a479cb47f0 +refs/heads/master: 4bd0e030aadaba4a0e8fd5c0233d7e61f2e6207d diff --git a/trunk/drivers/media/platform/exynos-gsc/gsc-m2m.c b/trunk/drivers/media/platform/exynos-gsc/gsc-m2m.c index 3c7f00577bd9..047f0f0434ec 100644 --- a/trunk/drivers/media/platform/exynos-gsc/gsc-m2m.c +++ b/trunk/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"))