From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 108D4C28E86 for ; Mon, 15 Mar 2021 17:37:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D84BD64F18 for ; Mon, 15 Mar 2021 17:37:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236644AbhCORgv (ORCPT ); Mon, 15 Mar 2021 13:36:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236038AbhCORgR (ORCPT ); Mon, 15 Mar 2021 13:36:17 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7F41C06174A for ; Mon, 15 Mar 2021 10:36:16 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id lr13so67727300ejb.8 for ; Mon, 15 Mar 2021 10:36:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=soZrX7bZGsiX5k9H3diOg1AsKg7GoSGDwOafVa3bJcc=; b=hwmJINQF7BWP64sbdUotGVEehJ3UEFxD6qJgj/lsR+fUa6zttiqQjRIXop01F38E5w /QhVdjEE8c/n5l0/rSHESvPKMj1ZkPogErGYzNecsIx8kNMPFjvND4W6ZwTZzZkXssA9 y6fSs78tXd5FbqzxSs3aUpAZSCkN0fXjJJRAQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=soZrX7bZGsiX5k9H3diOg1AsKg7GoSGDwOafVa3bJcc=; b=nyTZ5+qkDzSbPX8iiAyXRh81kU6Ypd78V8fa1RdGunjVVdvxbUnOOWGmGCauATtpnj nhOEltSvPk0ZYrqVr/ha/7fUQgSQeO66uJ6A3Fo4+VFltm0nKsdmpehVztOA9Q43pdSS iIxrdCaK5SLwJrZ3MHBpUzh//7ylLUnpqElhP/KPlA0K9XReIoX5Dr3WuAc1OEGWChkK zRQuh+tPkssV63mADku6t4JFBag1TSDl4kxD4CQksMQemm/F4QyEGBqZXYUk1HNIzjh5 0DE5YKLt4ssP/Y8D/Xrrp2K+ZlzMO7NRDXNmkOXsi2wxJP4YmglDLEdFKijYkcK+ZClP wqvQ== X-Gm-Message-State: AOAM531yCViCQYxh5hgEdVvfxe0HxTJcO2+4DGZms9VMBATuNwCif2XY 58GQF0AYWbpE+uNS5F5GoGejmQ== X-Google-Smtp-Source: ABdhPJxCh52nkgCVDHtDPbJLaRJrEli0yWNDksq5LHcrE+89cBJRk/HvM9pDZTNZm9AdxeSj2P6Xvg== X-Received: by 2002:a17:906:2404:: with SMTP id z4mr24600130eja.14.1615829775599; Mon, 15 Mar 2021 10:36:15 -0700 (PDT) Received: from alco.lan ([80.71.134.83]) by smtp.gmail.com with ESMTPSA id a3sm8109239ejv.40.2021.03.15.10.36.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Mar 2021 10:36:15 -0700 (PDT) From: Ricardo Ribalda To: Laurent Pinchart , Mauro Carvalho Chehab , Hans Verkuil , Sergey Senozhatsky , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Ricardo Ribalda Subject: [PATCH v4 07/11] media: uvcvideo: Use dev->name for querycap() Date: Mon, 15 Mar 2021 18:36:05 +0100 Message-Id: <20210315173609.1547857-8-ribalda@chromium.org> X-Mailer: git-send-email 2.31.0.rc2.261.g7f71774620-goog In-Reply-To: <20210315173609.1547857-1-ribalda@chromium.org> References: <20210315173609.1547857-1-ribalda@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use the device name for the card name instead of cap->card. Suggested-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda --- drivers/media/usb/uvc/uvc_v4l2.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c index 36eb48622d48..6c1b037a751b 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; -- 2.31.0.rc2.261.g7f71774620-goog