[media] radio-miropcm20: fix querycap

Don't set version (done by the v4l2 core), fill in bus_info, set correct
driver name and add device_caps support.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/radio/radio-miropcm20.c b/drivers/media/radio/radio-miropcm20.c
index 11f76ed4c6fb7082e6f9de5f3ba717cab9f40faa..3a89e50ade6c16a6f8898787e595d19630fb71e1 100644 (file)
--- a/drivers/media/radio/radio-miropcm20.c
+++ b/drivers/media/radio/radio-miropcm20.c
@@ -79,11 +79,13 @@ static const struct v4l2_file_operations pcm20_fops = {
 static int vidioc_querycap(struct file *file, void *priv,
                                struct v4l2_capability *v)
 {
+       struct pcm20 *dev = video_drvdata(file);
+
        strlcpy(v->driver, "Miro PCM20", sizeof(v->driver));
        strlcpy(v->card, "Miro PCM20", sizeof(v->card));
-       strlcpy(v->bus_info, "ISA", sizeof(v->bus_info));
-       v->version = 0x1;
-       v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
+       snprintf(v->bus_info, sizeof(v->bus_info), "ISA:%s", dev->v4l2_dev.name);
+       v->device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO;
+       v->capabilities = v->device_caps | V4L2_CAP_DEVICE_CAPS;
        return 0;
 }
 
@@ -229,7 +231,7 @@ static int __init pcm20_init(void)
                         "you must load the snd-miro driver first!\n");
                return -ENODEV;
        }
-       strlcpy(v4l2_dev->name, "miropcm20", sizeof(v4l2_dev->name));
+       strlcpy(v4l2_dev->name, "radio-miropcm20", sizeof(v4l2_dev->name));
        mutex_init(&dev->lock);
 
        res = v4l2_device_register(NULL, v4l2_dev);