| Message ID | 20231207120912.270716-7-sakari.ailus@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | e55a9482888da73eeadde5f13ef8bafce68a38ed |
| Headers | show |
| Series | Old non-MC-aware drivers have no sub-device state | expand |
Hi Sakari, Thank you for the patch. On Thu, Dec 07, 2023 at 02:09:12PM +0200, Sakari Ailus wrote: > For the purpose of setting old non-pad based sub-device try format as a > basis for VIDIOC_TRY_FMT implementation, there is no need to set the > format in the sub-device state. Drop the assignment to the state, which > would result in a NULL pointer dereference. > > Fixes: fd17e3a9a788 ("media: i2c: Use accessors for pad config 'try_*' fields") > Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > drivers/media/i2c/ov9640.c | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c > index b0c171fe75bc..e9a52a8a9dc0 100644 > --- a/drivers/media/i2c/ov9640.c > +++ b/drivers/media/i2c/ov9640.c > @@ -547,8 +547,6 @@ static int ov9640_set_fmt(struct v4l2_subdev *sd, > if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) > return ov9640_s_fmt(sd, mf); > > - *v4l2_subdev_state_get_format(sd_state, 0) = *mf; > - > return 0; > } >
diff --git a/drivers/media/i2c/ov9640.c b/drivers/media/i2c/ov9640.c index b0c171fe75bc..e9a52a8a9dc0 100644 --- a/drivers/media/i2c/ov9640.c +++ b/drivers/media/i2c/ov9640.c @@ -547,8 +547,6 @@ static int ov9640_set_fmt(struct v4l2_subdev *sd, if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE) return ov9640_s_fmt(sd, mf); - *v4l2_subdev_state_get_format(sd_state, 0) = *mf; - return 0; }
For the purpose of setting old non-pad based sub-device try format as a basis for VIDIOC_TRY_FMT implementation, there is no need to set the format in the sub-device state. Drop the assignment to the state, which would result in a NULL pointer dereference. Fixes: fd17e3a9a788 ("media: i2c: Use accessors for pad config 'try_*' fields") Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- drivers/media/i2c/ov9640.c | 2 -- 1 file changed, 2 deletions(-)