diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-31 12:01:29 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-31 12:01:29 -0200 |
| commit | f902a281e447bad49c3fc1c855035a337bbcefab (patch) | |
| tree | 35778b00a4f7b82bf40dcfc4f027bbd0308ff000 /linux/drivers/media/video/bt8xx/bttv-vbi.c | |
| parent | 88f332f73bffc942ecd8aee59abd34df3fd69d6b (diff) | |
| parent | c7c16254d06970012c0473a2ca358e7725c35d91 (diff) | |
| download | mediapointer-dvb-s2-f902a281e447bad49c3fc1c855035a337bbcefab.tar.gz mediapointer-dvb-s2-f902a281e447bad49c3fc1c855035a337bbcefab.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/tuner-simple
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/bt8xx/bttv-vbi.c')
| -rw-r--r-- | linux/drivers/media/video/bt8xx/bttv-vbi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/bt8xx/bttv-vbi.c b/linux/drivers/media/video/bt8xx/bttv-vbi.c index d17e583c0..bfdbc469e 100644 --- a/linux/drivers/media/video/bt8xx/bttv-vbi.c +++ b/linux/drivers/media/video/bt8xx/bttv-vbi.c @@ -352,13 +352,13 @@ int bttv_s_fmt_vbi(struct file *file, void *f, struct v4l2_format *frt) because vbi_fmt.end counts field lines times two. */ end = max(frt->fmt.vbi.start[0], start1) * 2 + 2; - mutex_lock(&fh->vbi.lock); + mutex_lock(&fh->vbi.vb_lock); fh->vbi_fmt.fmt = frt->fmt.vbi; fh->vbi_fmt.tvnorm = tvnorm; fh->vbi_fmt.end = end; - mutex_unlock(&fh->vbi.lock); + mutex_unlock(&fh->vbi.vb_lock); rc = 0; |