summaryrefslogtreecommitdiffstats
path: root/drivers/media/usb
diff options
context:
space:
mode:
authorMichael Grzeschik <m.grzeschik@pengutronix.de>2022-06-16 21:54:54 +0200
committerMauro Carvalho Chehab <mchehab@kernel.org>2022-07-16 09:53:22 +0200
commit1fef11a2f4660a48ed1a655d55226d930cb8ba13 (patch)
tree928840eb6bc0bca297e25b823ef16c0769458e62 /drivers/media/usb
parentmedia: uvcvideo: Limit power line control for Acer EasyCamera (diff)
downloadlinux-1fef11a2f4660a48ed1a655d55226d930cb8ba13.tar.xz
linux-1fef11a2f4660a48ed1a655d55226d930cb8ba13.zip
media: uvcvideo: Remove unneeded goto
The goto statement in uvc_v4l2_try_format can simply be replaced by an direct return. There is no further user of the label, so remove it. Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media/usb')
-rw-r--r--drivers/media/usb/uvc/uvc_v4l2.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index b36f9cc57cd4..4cc3fa6b8c98 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -258,7 +258,7 @@ static int uvc_v4l2_try_format(struct uvc_streaming *stream,
ret = uvc_probe_video(stream, probe);
mutex_unlock(&stream->mutex);
if (ret < 0)
- goto done;
+ return ret;
/*
* After the probe, update fmt with the values returned from
@@ -305,7 +305,6 @@ static int uvc_v4l2_try_format(struct uvc_streaming *stream,
if (uvc_frame != NULL)
*uvc_frame = frame;
-done:
return ret;
}