summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Petter Selasky <hselasky@c2i.net>2011-05-23 08:13:06 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 17:52:20 -0300
commit2ef403708880c6e00854fb81bbffb9a4036327e6 (patch)
tree2cfc6a78b6a160faba39d3dc72085b120ca6b979
parent82f7b59cb80679038e8e3a99738cce5e094f69b6 (diff)
downloadlinux-stable-2ef403708880c6e00854fb81bbffb9a4036327e6.tar.gz
linux-stable-2ef403708880c6e00854fb81bbffb9a4036327e6.tar.bz2
linux-stable-2ef403708880c6e00854fb81bbffb9a4036327e6.zip
[media] Fix compile warning: Dereferencing type-punned pointer will break strict-aliasing rules
Signed-off-by: Hans Petter Selasky <hselasky@c2i.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/v4l2-ioctl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index 69e8c6ffcc49..55df1436f835 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -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;