[v10,10/21] media: uvcvideo: Use dev->name for querycap()

Message ID	20210618122923.385938-11-ribalda@chromium.org
State	Accepted
Commit	457e7911dfb81a31834c25ab7f13a4475350459b
Headers	show Return-Path: <linux-media-owner@kernel.org> From: Ricardo Ribalda <ribalda@chromium.org> To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Hans Verkuil <hverkuil-cisco@xs4all.nl>, Mauro Carvalho Chehab <mchehab@kernel.org>, Sergey Senozhatsky <sergey.senozhatsky@gmail.com>, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, tfiga@chromium.org Cc: Ricardo Ribalda <ribalda@chromium.org> Subject: [PATCH v10 10/21] media: uvcvideo: Use dev->name for querycap() Date: Fri, 18 Jun 2021 14:29:12 +0200 Message-Id: <20210618122923.385938-11-ribalda@chromium.org> In-Reply-To: <20210618122923.385938-1-ribalda@chromium.org> References: <20210618122923.385938-1-ribalda@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	[v10,01/21] media: v4l2-ioctl: Fix check_ext_ctrls \| expand [v10,01/21] media: v4l2-ioctl: Fix check_ext_ctrls [v10,03/21] media: uvcvideo: Do not check for V4L2_CTRL_WHICH_DEF_VAL [v10,06/21] media: uvcvideo: Set capability in s_param [v10,07/21] media: uvcvideo: Return -EIO for control errors [v10,10/21] media: uvcvideo: Use dev->name for querycap() [v10,13/21] media: uvcvideo: Use control names from framework [v10,14/21] media: uvcvideo: Check controls flags before accessing them [v10,16/21] media: docs: Document the behaviour of uvcvideo driver [v10,18/21] uvcvideo: improve error handling in uvc_query_ctrl() [v10,19/21] uvcvideo: don't spam the log in uvc_ctrl_restore_values() [v10,21/21] media: uvcvideo: Return -EACCES to inactive controls

Message ID

20210618122923.385938-11-ribalda@chromium.org

State

Accepted

Commit

457e7911dfb81a31834c25ab7f13a4475350459b

Headers

From: Ricardo Ribalda <ribalda@chromium.org>
To: Laurent Pinchart <laurent.pinchart@ideasonboard.com>,
	Hans Verkuil <hverkuil-cisco@xs4all.nl>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	Sergey Senozhatsky <sergey.senozhatsky@gmail.com>,
	linux-media@vger.kernel.org, linux-kernel@vger.kernel.org,
	tfiga@chromium.org
Cc: Ricardo Ribalda <ribalda@chromium.org>
Subject: [PATCH v10 10/21] media: uvcvideo: Use dev->name for querycap()
Date: Fri, 18 Jun 2021 14:29:12 +0200
Message-Id: <20210618122923.385938-11-ribalda@chromium.org>
In-Reply-To: <20210618122923.385938-1-ribalda@chromium.org>
References: <20210618122923.385938-1-ribalda@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

[v10,01/21] media: v4l2-ioctl: Fix check_ext_ctrls | expand

Commit Message

Ricardo Ribalda June 18, 2021, 12:29 p.m. UTC

Use the device name for the card name instead of vdev->name. That way
all the devices have a different name instead of the common vdev->name.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Suggested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
---
 drivers/media/usb/uvc/uvc_metadata.c | 2 +-
 drivers/media/usb/uvc/uvc_v4l2.c     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/media/usb/uvc/uvc_metadata.c b/drivers/media/usb/uvc/uvc_metadata.c
index b6279ad7ac84..82de7781f5b6 100644
--- a/drivers/media/usb/uvc/uvc_metadata.c
+++ b/drivers/media/usb/uvc/uvc_metadata.c
@@ -30,7 +30,7 @@  static int uvc_meta_v4l2_querycap(struct file *file, void *fh,
 	struct uvc_video_chain *chain = stream->chain;
 
 	strscpy(cap->driver, "uvcvideo", sizeof(cap->driver));
-	strscpy(cap->card, vfh->vdev->name, sizeof(cap->card));
+	strscpy(cap->card, stream->dev->name, sizeof(cap->card));
 	usb_make_path(stream->dev->udev, cap->bus_info, sizeof(cap->bus_info));
 	cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING
 			  | chain->caps;
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 1eeeb00280e4..9cdd30eff495 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -617,13 +617,12 @@  static int uvc_v4l2_release(struct file *file)
 static int uvc_ioctl_querycap(struct file *file, void *fh,
 			      struct v4l2_capability *cap)
 {
-	struct video_device *vdev = video_devdata(file);
 	struct uvc_fh *handle = file->private_data;
 	struct uvc_video_chain *chain = handle->chain;
 	struct uvc_streaming *stream = handle->stream;
 
 	strscpy(cap->driver, "uvcvideo", sizeof(cap->driver));
-	strscpy(cap->card, vdev->name, sizeof(cap->card));
+	strscpy(cap->card, handle->stream->dev->name, sizeof(cap->card));
 	usb_make_path(stream->dev->udev, cap->bus_info, sizeof(cap->bus_info));
 	cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING
 			  | chain->caps;

[v10,10/21] media: uvcvideo: Use dev->name for querycap()

Commit Message

Patch