exynos: fix two warnings
authorDaniel Kurtz <djkurtz@chromium.org>
Thu, 17 Apr 2014 03:54:36 +0000 (11:54 +0800)
committerRob Clark <robclark@freedesktop.org>
Tue, 13 May 2014 03:09:12 +0000 (23:09 -0400)
warning: assignment makes pointer from integer without a cast [enabled by default]
warning: initialization makes integer from pointer without a cast [enabled by default]

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Acked-by: Inki Dae <inki.dae@samsung.com>
exynos/exynos_drm.c

index 4db755e..b7acdf5 100644 (file)
@@ -294,7 +294,7 @@ void *exynos_bo_map(struct exynos_bo *bo)
                        return NULL;
                }
 
-               bo->vaddr = req.mapped;
+               bo->vaddr = (void *)(uintptr_t)req.mapped;
        }
 
        return bo->vaddr;
@@ -381,7 +381,7 @@ int exynos_vidi_connection(struct exynos_device *dev, uint32_t connect,
        struct drm_exynos_vidi_connection req = {
                .connection     = connect,
                .extensions     = ext,
-               .edid           = edid,
+               .edid           = (uint64_t)(uintptr_t)edid,
        };
        int ret;