2 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index 19cbb12a12a2..cc7b218d047c 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -982,7 +982,7 @@ static void *gsc_get_drv_data(struct platform_device *pdev)
                 match = of_match_node(of_match_ptr(exynos_gsc_match),
                                         pdev->dev.of_node);
                 if (match)
-                        driver_data =  match->data;
+                        driver_data = (struct gsc_driverdata *)match->data;
         } else {
                 driver_data = (struct gsc_driverdata *)
                         platform_get_device_id(pdev)->driver_data;
diff --git a/drivers/media/platform/exynos-gsc/gsc-m2m.c b/drivers/media/platform/exynos-gsc/gsc-m2m.c
index c065d040ed94..c267c57c76fd 100644
--- 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"))