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, URIBL_BLOCKED,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 327B7C43381 for ; Fri, 26 Mar 2021 09:59:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0471761A3F for ; Fri, 26 Mar 2021 09:59:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230273AbhCZJ7O (ORCPT ); Fri, 26 Mar 2021 05:59:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229984AbhCZJ6w (ORCPT ); Fri, 26 Mar 2021 05:58:52 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F3FBC0613AA for ; Fri, 26 Mar 2021 02:58:52 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id h13so5618210eds.5 for ; Fri, 26 Mar 2021 02:58:52 -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=neLiXa2Mi6CDcIfMH5ROa7xzDK4SNK6Agg6TL5Pdv3o=; b=MNmPEK9lIQNgbpBYhPsqp2edjQg+xONrsRZIssar5j4aaFrDqaurTJfP1xgfLSK0WN 5y/10UcuCCAaLgzms8MSu1El17SUFkSZWcWHZ7IHI5Y9jf6ePA5IIBK//jFX/7TSJoMs Za58Cbu69jOLbFTSAH3gzY4Mu1n5pkfxBaTCs= 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=neLiXa2Mi6CDcIfMH5ROa7xzDK4SNK6Agg6TL5Pdv3o=; b=RGHP4mu067yRbyNaMJmuM6Na0D7vyEYKGPjXMEvW6PSjryBbySD8tETg9Khx5jMlQU wn6oNwP3/yn7cx4p5Ca1+t4l3jovbpT2HRHr1IS6oZ4QqTqZsQ+ZqbV3w84A58KmUvp9 bMQUFzp1V/eYebA+CCFWeD+VLe5bcCeAVwF8fevxrq5yFKZHrJJZNeGp/EpOOxoz/v4A XTWcMH2fq4VZ8Bbpj9T7mXRD90kRR0g3IU63+S1KNI95gn2EufG2uO2HFkV1iDp9JFZP PdSltCO061umhRTZYHd2ozse/AgC63jCmubhvpy8lRyD1Z6IhJNaaWvs58Xbn7/Upklu HO9w== X-Gm-Message-State: AOAM532FhUzxupL4lj0h/gH+bQz2mUO5n0roaVIkEeHDVO6Md0vG0Xos fLMY82b5zu+0OXbWm96A00fNwg== X-Google-Smtp-Source: ABdhPJyY86L134zDeIC7L+s0ilnz4gVN2MQoMfUvKiVniAtbV8Gs0lxjGIPY6ZiLrM4Hi7NK2/vJqw== X-Received: by 2002:a50:ef0a:: with SMTP id m10mr13899340eds.261.1616752731083; Fri, 26 Mar 2021 02:58:51 -0700 (PDT) Received: from alco.lan ([80.71.134.83]) by smtp.gmail.com with ESMTPSA id h13sm4036658edz.71.2021.03.26.02.58.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Mar 2021 02:58:50 -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, tfiga@chromium.org Cc: Ricardo Ribalda Subject: [PATCH v9 10/22] media: uvcvideo: Use dev->name for querycap() Date: Fri, 26 Mar 2021 10:58:28 +0100 Message-Id: <20210326095840.364424-11-ribalda@chromium.org> X-Mailer: git-send-email 2.31.0.291.g576ba9dcdaf-goog In-Reply-To: <20210326095840.364424-1-ribalda@chromium.org> References: <20210326095840.364424-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 vdev->name. Signed-off-by: Hans Verkuil Suggested-by: Laurent Pinchart Signed-off-by: Ricardo Ribalda --- 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; -- 2.31.0.291.g576ba9dcdaf-goog