Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm...

[cascardo/linux.git] / drivers / gpu / host1x / cdma.c

diff --git a/drivers/gpu/host1x/cdma.c b/drivers/gpu/host1x/cdma.c
index 3995255..5a8c8d5 100644 (file)
--- a/drivers/gpu/host1x/cdma.c
+++ b/drivers/gpu/host1x/cdma.c
@@ -97,7 +97,7 @@ fail:
 static void host1x_pushbuffer_push(struct push_buffer *pb, u32 op1, u32 op2)
 {
        u32 pos = pb->pos;
-       u32 *p = (u32 *)((u32)pb->mapped + pos);
+       u32 *p = (u32 *)((void *)pb->mapped + pos);
        WARN_ON(pos == pb->fence);
        *(p++) = op1;
        *(p++) = op2;