summaryrefslogtreecommitdiff
path: root/exynos
diff options
context:
space:
mode:
authorDaniel Kurtz <djkurtz@chromium.org>2014-04-17 11:54:36 +0800
committerRob Clark <robclark@freedesktop.org>2014-05-12 23:09:12 -0400
commitebe21baec5ec180068eb2ec2a97561ba7b482a38 (patch)
treefc3bcc08cb8254a001167af923353e11795a507f /exynos
parent71bbf86f58b5b1fccc045dced8612572c01a93eb (diff)
exynos: fix two warnings
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>
Diffstat (limited to 'exynos')
-rw-r--r--exynos/exynos_drm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/exynos/exynos_drm.c b/exynos/exynos_drm.c
index 4db755e7..b7acdf5e 100644
--- a/exynos/exynos_drm.c
+++ b/exynos/exynos_drm.c
@@ -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;