]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
media: vimc: fill in bus_info in media_device_info
authorHans Verkuil <hverkuil-cisco@xs4all.nl>
Wed, 30 Jan 2019 13:43:51 +0000 (08:43 -0500)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Thu, 7 Feb 2019 17:38:59 +0000 (12:38 -0500)
It is good practice to fill in bus_info.

Also just use 'platform:vimc' when filling in the bus_info in querycap:
the bus_info has nothing to do with the video device name.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: Helen Koike <helen.koike@collabora.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
drivers/media/platform/vimc/vimc-capture.c
drivers/media/platform/vimc/vimc-core.c

index 93837d9eecd2faa829e9ceb669fb9d577a0bad5c..a6f8715d2b44e7192cc03e8302667dede641958a 100644 (file)
@@ -70,12 +70,10 @@ struct vimc_cap_buffer {
 static int vimc_cap_querycap(struct file *file, void *priv,
                             struct v4l2_capability *cap)
 {
-       struct vimc_cap_device *vcap = video_drvdata(file);
-
        strscpy(cap->driver, VIMC_PDEV_NAME, sizeof(cap->driver));
        strscpy(cap->card, KBUILD_MODNAME, sizeof(cap->card));
        snprintf(cap->bus_info, sizeof(cap->bus_info),
-                "platform:%s", vcap->vdev.v4l2_dev->name);
+                "platform:%s", VIMC_PDEV_NAME);
 
        return 0;
 }
index bf19f1f9795e4bacea8ea7a0d69c7d6bd1a20bc6..c2fdf3ea67ed102516fff66f9086a20a773b87d6 100644 (file)
@@ -318,6 +318,8 @@ static int vimc_probe(struct platform_device *pdev)
        /* Initialize media device */
        strscpy(vimc->mdev.model, VIMC_MDEV_MODEL_NAME,
                sizeof(vimc->mdev.model));
+       snprintf(vimc->mdev.bus_info, sizeof(vimc->mdev.bus_info),
+                "platform:%s", VIMC_PDEV_NAME);
        vimc->mdev.dev = &pdev->dev;
        media_device_init(&vimc->mdev);