Commit 153d11cc authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: imx214: don't de-reference a NULL pointer

As warned by smatch:
	drivers/media/i2c/imx214.c:591 imx214_set_format() warn: variable dereferenced before check 'format' (see line 589)

It turns that the code at imx214_set_format() has support for being
called with the format being NULL. I've no idea why, as it is only
called internally with the pointer set, and via subdev API (with
should also set it).

Also, the entire logic there depends on having format != NULL, so
just remove the bogus broken support for a null format.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Reviewed-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: default avatarRicardo Ribalda Delgado <ricardo@ribalda.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 149e31e9
...@@ -588,12 +588,10 @@ static int imx214_set_format(struct v4l2_subdev *sd, ...@@ -588,12 +588,10 @@ static int imx214_set_format(struct v4l2_subdev *sd,
__crop = __imx214_get_pad_crop(imx214, cfg, format->pad, format->which); __crop = __imx214_get_pad_crop(imx214, cfg, format->pad, format->which);
if (format) mode = v4l2_find_nearest_size(imx214_modes,
mode = v4l2_find_nearest_size(imx214_modes, ARRAY_SIZE(imx214_modes), width, height,
ARRAY_SIZE(imx214_modes), width, height, format->format.width,
format->format.width, format->format.height); format->format.height);
else
mode = &imx214_modes[0];
__crop->width = mode->width; __crop->width = mode->width;
__crop->height = mode->height; __crop->height = mode->height;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment