aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/platform/vimc/vimc-capture.c4
-rw-r--r--drivers/media/platform/vimc/vimc-core.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/platform/vimc/vimc-capture.c b/drivers/media/platform/vimc/vimc-capture.c
index 93837d9eecd2..a6f8715d2b44 100644
--- a/drivers/media/platform/vimc/vimc-capture.c
+++ b/drivers/media/platform/vimc/vimc-capture.c
@@ -70,12 +70,10 @@ struct vimc_cap_buffer {
70static int vimc_cap_querycap(struct file *file, void *priv, 70static int vimc_cap_querycap(struct file *file, void *priv,
71 struct v4l2_capability *cap) 71 struct v4l2_capability *cap)
72{ 72{
73 struct vimc_cap_device *vcap = video_drvdata(file);
74
75 strscpy(cap->driver, VIMC_PDEV_NAME, sizeof(cap->driver)); 73 strscpy(cap->driver, VIMC_PDEV_NAME, sizeof(cap->driver));
76 strscpy(cap->card, KBUILD_MODNAME, sizeof(cap->card)); 74 strscpy(cap->card, KBUILD_MODNAME, sizeof(cap->card));
77 snprintf(cap->bus_info, sizeof(cap->bus_info), 75 snprintf(cap->bus_info, sizeof(cap->bus_info),
78 "platform:%s", vcap->vdev.v4l2_dev->name); 76 "platform:%s", VIMC_PDEV_NAME);
79 77
80 return 0; 78 return 0;
81} 79}
diff --git a/drivers/media/platform/vimc/vimc-core.c b/drivers/media/platform/vimc/vimc-core.c
index bf19f1f9795e..c2fdf3ea67ed 100644
--- a/drivers/media/platform/vimc/vimc-core.c
+++ b/drivers/media/platform/vimc/vimc-core.c
@@ -318,6 +318,8 @@ static int vimc_probe(struct platform_device *pdev)
318 /* Initialize media device */ 318 /* Initialize media device */
319 strscpy(vimc->mdev.model, VIMC_MDEV_MODEL_NAME, 319 strscpy(vimc->mdev.model, VIMC_MDEV_MODEL_NAME,
320 sizeof(vimc->mdev.model)); 320 sizeof(vimc->mdev.model));
321 snprintf(vimc->mdev.bus_info, sizeof(vimc->mdev.bus_info),
322 "platform:%s", VIMC_PDEV_NAME);
321 vimc->mdev.dev = &pdev->dev; 323 vimc->mdev.dev = &pdev->dev;
322 media_device_init(&vimc->mdev); 324 media_device_init(&vimc->mdev);
323 325