UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] saa7164: add v4l2_fh support 

Control events require the use of struct v4l2_fh. Add this to saa7164.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
This commit is contained in:
Hans Verkuil 2015-08-28 08:48:27 -03:00 committed by Mauro Carvalho Chehab
parent 1a708ea013
commit d6d3fe2fe1
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/media/pci/saa7164/saa7164-encoder.c
View File

@ -746,8 +746,10 @@ static int fops_open(struct file *file)
if (NULL == fh)
return -ENOMEM;
file->private_data = fh;
fh->port = port;
v4l2_fh_init(&fh->fh, video_devdata(file));
v4l2_fh_add(&fh->fh);
file->private_data = fh;
return 0;
}
@ -768,7 +770,8 @@ static int fops_release(struct file *file)
}
}
file->private_data = NULL;
v4l2_fh_del(&fh->fh);
v4l2_fh_exit(&fh->fh);
kfree(fh);
return 0;

7
drivers/media/pci/saa7164/saa7164-vbi.c
View File

@ -678,8 +678,10 @@ static int fops_open(struct file *file)
if (NULL == fh)
return -ENOMEM;
file->private_data = fh;
fh->port = port;
v4l2_fh_init(&fh->fh, video_devdata(file));
v4l2_fh_add(&fh->fh);
file->private_data = fh;
return 0;
}
@ -700,7 +702,8 @@ static int fops_release(struct file *file)
}
}
file->private_data = NULL;
v4l2_fh_del(&fh->fh);
v4l2_fh_exit(&fh->fh);
kfree(fh);
return 0;

2
drivers/media/pci/saa7164/saa7164.h
View File

@ -186,11 +186,13 @@ struct saa7164_subid {
};
struct saa7164_encoder_fh {
struct v4l2_fh fh;
struct saa7164_port *port;
atomic_t v4l_reading;
};
struct saa7164_vbi_fh {
struct v4l2_fh fh;
struct saa7164_port *port;
atomic_t v4l_reading;
};