korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-23 02:54:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[media] radio-miropcm20: fix querycap

Browse Source 
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>
This commit is contained in:
Hans Verkuil 2013-01-30 11:26:36 -03:00 committed by Mauro Carvalho Chehab
parent c9114031d8
commit f122d9a83e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/radio/radio-miropcm20.c
View File

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