diff options
| author | Mauro Carvalho Chehab <[email protected]> | 2018-12-07 06:43:03 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <[email protected]> | 2019-03-25 14:40:56 -0400 |
| commit | 153d11cc530cb2a3045167253582d3d2849ad519 (patch) | |
| tree | abeedf6bae87ff01953d112621da109f98a28c63 | |
| parent | 149e31e90b505ae0cc909bd0d92b2ba4826574d6 (diff) | |
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: Mauro Carvalho Chehab <[email protected]>
Reviewed-by: Hans Verkuil <[email protected]>
Reviewed-by: Ricardo Ribalda Delgado <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
| -rw-r--r-- | drivers/media/i2c/imx214.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index 9857e151db46..83e9961b0505 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -588,12 +588,10 @@ static int imx214_set_format(struct v4l2_subdev *sd, __crop = __imx214_get_pad_crop(imx214, cfg, format->pad, format->which); - if (format) - mode = v4l2_find_nearest_size(imx214_modes, - ARRAY_SIZE(imx214_modes), width, height, - format->format.width, format->format.height); - else - mode = &imx214_modes[0]; + mode = v4l2_find_nearest_size(imx214_modes, + ARRAY_SIZE(imx214_modes), width, height, + format->format.width, + format->format.height); __crop->width = mode->width; __crop->height = mode->height; |