diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-12-18 09:20:59 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2011-01-19 11:28:10 -0200 |
| commit | 9af39713feb53da96ba23fa94a73ffd0de50a815 (patch) | |
| tree | 264b278d0e741e031f0c9ed940fd78e5502de6e8 /drivers/media/common/saa7146_vbi.c | |
| parent | b219ab9cfb2057de6e779169197f83265c310c83 (diff) | |
| download | kernel_samsung_smdk4412-9af39713feb53da96ba23fa94a73ffd0de50a815.zip kernel_samsung_smdk4412-9af39713feb53da96ba23fa94a73ffd0de50a815.tar.gz kernel_samsung_smdk4412-9af39713feb53da96ba23fa94a73ffd0de50a815.tar.bz2 | |
[media] saa7146: Convert from .ioctl to .unlocked_ioctl
Convert saa7146 to use core-assisted locking.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/common/saa7146_vbi.c')
| -rw-r--r-- | drivers/media/common/saa7146_vbi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c index 2d4533a..afe8580 100644 --- a/drivers/media/common/saa7146_vbi.c +++ b/drivers/media/common/saa7146_vbi.c @@ -412,7 +412,7 @@ static int vbi_open(struct saa7146_dev *dev, struct file *file) V4L2_BUF_TYPE_VBI_CAPTURE, V4L2_FIELD_SEQ_TB, // FIXME: does this really work? sizeof(struct saa7146_buf), - file, NULL); + file, &dev->v4l2_lock); init_timer(&fh->vbi_read_timeout); fh->vbi_read_timeout.function = vbi_read_timeout; |