diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-01-30 09:26:36 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-02-05 15:10:37 -0500 |
commit | f122d9a83e5d1e73f34da9fb832c9b005030b9cb (patch) | |
tree | fa412496b4174562bd740e4c128b82c4f6921dad /drivers | |
parent | c9114031d88bb71659d7f0cc74ecf8ddea47e1b7 (diff) |
[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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/media/radio/radio-miropcm20.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/radio/radio-miropcm20.c b/drivers/media/radio/radio-miropcm20.c index 11f76ed4c6fb..3a89e50ade6c 100644 --- 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 = { | |||
79 | static int vidioc_querycap(struct file *file, void *priv, | 79 | static int vidioc_querycap(struct file *file, void *priv, |
80 | struct v4l2_capability *v) | 80 | struct v4l2_capability *v) |
81 | { | 81 | { |
82 | struct pcm20 *dev = video_drvdata(file); | ||
83 | |||
82 | strlcpy(v->driver, "Miro PCM20", sizeof(v->driver)); | 84 | strlcpy(v->driver, "Miro PCM20", sizeof(v->driver)); |
83 | strlcpy(v->card, "Miro PCM20", sizeof(v->card)); | 85 | strlcpy(v->card, "Miro PCM20", sizeof(v->card)); |
84 | strlcpy(v->bus_info, "ISA", sizeof(v->bus_info)); | 86 | snprintf(v->bus_info, sizeof(v->bus_info), "ISA:%s", dev->v4l2_dev.name); |
85 | v->version = 0x1; | 87 | v->device_caps = V4L2_CAP_TUNER | V4L2_CAP_RADIO; |
86 | v->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO; | 88 | v->capabilities = v->device_caps | V4L2_CAP_DEVICE_CAPS; |
87 | return 0; | 89 | return 0; |
88 | } | 90 | } |
89 | 91 | ||
@@ -229,7 +231,7 @@ static int __init pcm20_init(void) | |||
229 | "you must load the snd-miro driver first!\n"); | 231 | "you must load the snd-miro driver first!\n"); |
230 | return -ENODEV; | 232 | return -ENODEV; |
231 | } | 233 | } |
232 | strlcpy(v4l2_dev->name, "miropcm20", sizeof(v4l2_dev->name)); | 234 | strlcpy(v4l2_dev->name, "radio-miropcm20", sizeof(v4l2_dev->name)); |
233 | mutex_init(&dev->lock); | 235 | mutex_init(&dev->lock); |
234 | 236 | ||
235 | res = v4l2_device_register(NULL, v4l2_dev); | 237 | res = v4l2_device_register(NULL, v4l2_dev); |