| Message ID | 20200211073522.jobdu256d22c3y32@kili.mountain (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: staging/imx: Missing assignment in imx_media_capture_device_register() | expand |
Thanks for catching. Tested on a imx6 sabreauto and it's fine. On 2/10/20 11:35 PM, Dan Carpenter wrote: > There was supposed to be a "ret = " assignment here, otherwise the > error handling on the next line won't work. > > Fixes: 64b5a49df486 ("[media] media: imx: Add Capture Device Interface") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Steve Longerbeam <slongerbeam@gmail.com> > --- > Not tested. Sometimes in these situations the function could be > returning something bogus but no one knew because the assignment wasn't > there. So it's best to test these. > > drivers/staging/media/imx/imx-media-capture.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c > index 7712e7be8625..df0bf680721b 100644 > --- a/drivers/staging/media/imx/imx-media-capture.c > +++ b/drivers/staging/media/imx/imx-media-capture.c > @@ -778,7 +778,7 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev) > /* setup default format */ > fmt_src.pad = priv->src_sd_pad; > fmt_src.which = V4L2_SUBDEV_FORMAT_ACTIVE; > - v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt_src); > + ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt_src); > if (ret) { > v4l2_err(sd, "failed to get src_sd format\n"); > goto unreg;
diff --git a/drivers/staging/media/imx/imx-media-capture.c b/drivers/staging/media/imx/imx-media-capture.c index 7712e7be8625..df0bf680721b 100644 --- a/drivers/staging/media/imx/imx-media-capture.c +++ b/drivers/staging/media/imx/imx-media-capture.c @@ -778,7 +778,7 @@ int imx_media_capture_device_register(struct imx_media_video_dev *vdev) /* setup default format */ fmt_src.pad = priv->src_sd_pad; fmt_src.which = V4L2_SUBDEV_FORMAT_ACTIVE; - v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt_src); + ret = v4l2_subdev_call(sd, pad, get_fmt, NULL, &fmt_src); if (ret) { v4l2_err(sd, "failed to get src_sd format\n"); goto unreg;
There was supposed to be a "ret = " assignment here, otherwise the error handling on the next line won't work. Fixes: 64b5a49df486 ("[media] media: imx: Add Capture Device Interface") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- Not tested. Sometimes in these situations the function could be returning something bogus but no one knew because the assignment wasn't there. So it's best to test these. drivers/staging/media/imx/imx-media-capture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)