diff options
author | Hans Petter Selasky <hselasky@c2i.net> | 2011-05-23 07:13:06 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-07-27 16:52:20 -0400 |
commit | 2ef403708880c6e00854fb81bbffb9a4036327e6 (patch) | |
tree | 2cfc6a78b6a160faba39d3dc72085b120ca6b979 /drivers/media/video/v4l2-ioctl.c | |
parent | 82f7b59cb80679038e8e3a99738cce5e094f69b6 (diff) |
[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>
Diffstat (limited to 'drivers/media/video/v4l2-ioctl.c')
-rw-r--r-- | drivers/media/video/v4l2-ioctl.c | 4 |
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, | |||
2276 | break; | 2276 | break; |
2277 | } | 2277 | } |
2278 | *user_ptr = (void __user *)buf->m.planes; | 2278 | *user_ptr = (void __user *)buf->m.planes; |
2279 | *kernel_ptr = (void **)&buf->m.planes; | 2279 | *kernel_ptr = (void *)&buf->m.planes; |
2280 | *array_size = sizeof(struct v4l2_plane) * buf->length; | 2280 | *array_size = sizeof(struct v4l2_plane) * buf->length; |
2281 | ret = 1; | 2281 | ret = 1; |
2282 | } | 2282 | } |
@@ -2290,7 +2290,7 @@ static int check_array_args(unsigned int cmd, void *parg, size_t *array_size, | |||
2290 | 2290 | ||
2291 | if (ctrls->count != 0) { | 2291 | if (ctrls->count != 0) { |
2292 | *user_ptr = (void __user *)ctrls->controls; | 2292 | *user_ptr = (void __user *)ctrls->controls; |
2293 | *kernel_ptr = (void **)&ctrls->controls; | 2293 | *kernel_ptr = (void *)&ctrls->controls; |
2294 | *array_size = sizeof(struct v4l2_ext_control) | 2294 | *array_size = sizeof(struct v4l2_ext_control) |
2295 | * ctrls->count; | 2295 | * ctrls->count; |
2296 | ret = 1; | 2296 | ret = 1; |