lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 244/917] media: ipu3-imgu: VIDIOC_QUERYCAP: Fix bus_info
    Date
    From: Ricardo Ribalda <ribalda@chromium.org>

    [ Upstream commit ea2b9a33711604e91f8c826f4dcb3c12baa1990a ]

    bus_info field had a different value for the media entity and the video
    device.

    Fixes v4l2-compliance:

    v4l2-compliance.cpp(637): media bus_info 'PCI:0000:00:05.0' differs from
    V4L2 bus_info 'PCI:viewfinder'

    Reviewed-by: Bingbu Cao <bingbu.cao@intel.com>
    Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
    Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/staging/media/ipu3/ipu3-v4l2.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/media/ipu3/ipu3-v4l2.c b/drivers/staging/media/ipu3/ipu3-v4l2.c
    index ea746e8054eb7..90c86ba5040e3 100644
    --- a/drivers/staging/media/ipu3/ipu3-v4l2.c
    +++ b/drivers/staging/media/ipu3/ipu3-v4l2.c
    @@ -592,11 +592,12 @@ static const struct imgu_fmt *find_format(struct v4l2_format *f, u32 type)
    static int imgu_vidioc_querycap(struct file *file, void *fh,
    struct v4l2_capability *cap)
    {
    - struct imgu_video_device *node = file_to_intel_imgu_node(file);
    + struct imgu_device *imgu = video_drvdata(file);

    strscpy(cap->driver, IMGU_NAME, sizeof(cap->driver));
    strscpy(cap->card, IMGU_NAME, sizeof(cap->card));
    - snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s", node->name);
    + snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s",
    + pci_name(imgu->pci_dev));

    return 0;
    }
    --
    2.33.0


    \
     
     \ /
      Last update: 2021-11-16 00:34    [W:3.071 / U:0.360 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site