summaryrefslogtreecommitdiff
path: root/drivers/media/usb/uvc/uvc_metadata.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/usb/uvc/uvc_metadata.c')
-rw-r--r--drivers/media/usb/uvc/uvc_metadata.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/uvc_metadata.c
index b35111d08759..ed859ef4463d 100644
--- a/drivers/media/usb/uvc/uvc_metadata.c
+++ b/drivers/media/usb/uvc/uvc_metadata.c
@@ -99,16 +99,12 @@ static int uvc_meta_v4l2_set_format(struct file *file, void *priv,
* Metadata buffers would still be perfectly parseable, but it's more
* consistent and cleaner to disallow that.
*/
- mutex_lock(&stream->mutex);
-
if (vb2_is_busy(&stream->meta.queue.queue))
- ret = -EBUSY;
- else
- stream->meta.format = fmt->dataformat;
+ return -EBUSY;
- mutex_unlock(&stream->mutex);
+ stream->meta.format = fmt->dataformat;
- return ret;
+ return 0;
}
static int uvc_meta_v4l2_enum_formats(struct file *file, void *priv,