]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: v4l-common: Make v4l2_find_nearest_size more sparse-friendly
authorSakari Ailus <sakari.ailus@linux.intel.com>
Thu, 21 Jun 2018 09:41:21 +0000 (05:41 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Thu, 28 Jun 2018 13:23:56 +0000 (09:23 -0400)
This sparse warning is emitted by using v4l2_find_nearest_size in some
cases. Fix it in the framework.

>> drivers/media/i2c/ov5640.c:1394:14: sparse: incorrect type in assignment
+(different base types) @@    expected struct ov5640_mode_info const *mode @@
+got ststruct ov5640_mode_info const *mode @@
   drivers/media/i2c/ov5640.c:1394:14:    expected struct ov5640_mode_info const
+*mode
   drivers/media/i2c/ov5640.c:1394:14:    got struct ov5640_mode_info const ( *<
+noident> )[9]

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
include/media/v4l2-common.h

index 160bca96d5241b8c85b7041ff711c499ae1088c7..cdc87ec61e54c85614576d99be71641e6c55f969 100644 (file)
@@ -338,7 +338,7 @@ void v4l_bound_align_image(unsigned int *width, unsigned int wmin,
        ({                                                              \
                BUILD_BUG_ON(sizeof((array)->width_field) != sizeof(u32) || \
                             sizeof((array)->height_field) != sizeof(u32)); \
-               (typeof(&(*(array))))__v4l2_find_nearest_size(          \
+               (typeof(&(array)[0]))__v4l2_find_nearest_size(          \
                        (array), array_size, sizeof(*(array)),          \
                        offsetof(typeof(*(array)), width_field),        \
                        offsetof(typeof(*(array)), height_field),       \