OSDN Git Service

[media] Fix compile warning: Dereferencing type-punned pointer will break strict...
authorHans Petter Selasky <hselasky@c2i.net>
Mon, 23 May 2011 11:13:06 +0000 (08:13 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 27 Jul 2011 20:52:20 +0000 (17:52 -0300)
Signed-off-by: Hans Petter Selasky <hselasky@c2i.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/v4l2-ioctl.c

index 69e8c6f..55df143 100644 (file)
@@ -2276,7 +2276,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
                                break;
                        }
                        *user_ptr = (void __user *)buf->m.planes;
-                       *kernel_ptr = (void **)&buf->m.planes;
+                       *kernel_ptr = (void *)&buf->m.planes;
                        *array_size = sizeof(struct v4l2_plane) * buf->length;
                        ret = 1;
                }
@@ -2290,7 +2290,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size,
 
                if (ctrls->count != 0) {
                        *user_ptr = (void __user *)ctrls->controls;
-                       *kernel_ptr = (void **)&ctrls->controls;
+                       *kernel_ptr = (void *)&ctrls->controls;
                        *array_size = sizeof(struct v4l2_ext_control)
                                    * ctrls->count;
                        ret = 1;