diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-31 11:57:53 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-31 11:57:53 -0200 |
| commit | 21ed876086e2efb38e6f2dfaf48fae94fe2ec738 (patch) | |
| tree | 655bae036dd26c2d65f5d4d666a37a5e5badcd2b /linux/drivers/media/video/saa7134/saa7134-empress.c | |
| parent | 7fdad17aa5f5e0f8d164613e27d828962100b4c9 (diff) | |
| download | mediapointer-dvb-s2-21ed876086e2efb38e6f2dfaf48fae94fe2ec738.tar.gz mediapointer-dvb-s2-21ed876086e2efb38e6f2dfaf48fae94fe2ec738.tar.bz2 | |
Renames videobuf lock to vb_lock
From: Mauro Carvalho Chehab <mchehab@infradead.org>
This helps to identify where vb_lock is being used, and find missusages of the
locks.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-empress.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-empress.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-empress.c b/linux/drivers/media/video/saa7134/saa7134-empress.c index dbd026a7c..7803f9983 100644 --- a/linux/drivers/media/video/saa7134/saa7134-empress.c +++ b/linux/drivers/media/video/saa7134/saa7134-empress.c @@ -96,7 +96,7 @@ static int ts_open(struct inode *inode, struct file *file) dprintk("open minor=%d\n",minor); err = -EBUSY; - if (!mutex_trylock(&dev->empress_tsq.lock)) + if (!mutex_trylock(&dev->empress_tsq.vb_lock)) goto done; if (dev->empress_users) goto done_up; @@ -110,7 +110,7 @@ static int ts_open(struct inode *inode, struct file *file) err = 0; done_up: - mutex_unlock(&dev->empress_tsq.lock); + mutex_unlock(&dev->empress_tsq.vb_lock); done: return err; } @@ -119,7 +119,7 @@ static int ts_release(struct inode *inode, struct file *file) { struct saa7134_dev *dev = file->private_data; - mutex_lock(&dev->empress_tsq.lock); + mutex_lock(&dev->empress_tsq.vb_lock); videobuf_stop(&dev->empress_tsq); videobuf_mmap_free(&dev->empress_tsq); dev->empress_users--; @@ -131,7 +131,7 @@ static int ts_release(struct inode *inode, struct file *file) saa_writeb(SAA7134_AUDIO_MUTE_CTRL, saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 << 6)); - mutex_unlock(&dev->empress_tsq.lock); + mutex_unlock(&dev->empress_tsq.vb_lock); return 0; } |