Merge commit 'v3.3-rc1' into fbdev-next

[firefly-linux-kernel-4.4.55.git] / drivers / media / video / vino.c

diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 52a0a3736c820d156025c8fc91df13d20cb31663..4d7391ec80013279d965db1070f978f3948cf241 100644 (file)
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -708,7 +708,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb,
                size, count);
 
        /* allocate memory for table with virtual (page) addresses */
-       fb->desc_table.virtual = (unsigned long *)
+       fb->desc_table.virtual =
                kmalloc(count * sizeof(unsigned long), GFP_KERNEL);
        if (!fb->desc_table.virtual)
                return -ENOMEM;