diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-01-31 11:59:29 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-02-18 09:15:12 -0500 |
commit | fb62a5953e9e6969f78adc7291c1a8845116f776 (patch) | |
tree | 0a702ac62d4c1d4128cac16866ae3011f5d8b872 /drivers/media | |
parent | 64f9477f95bf5d4ba49dc3988d47a15bc06bb5da (diff) |
V4L/DVB (7122): saa7134-empress: Remove back lock
videobuf functions at close() method already locks videobuf. It makes no sense
to keep the locking at empress close() method.
There is also a lock at open() method. I'm not sure if it is safe to remove the
locking there.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-empress.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index 94b81e1a7530..3d2ec30de227 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -110,7 +110,6 @@ static int ts_release(struct inode *inode, struct file *file) | |||
110 | { | 110 | { |
111 | struct saa7134_dev *dev = file->private_data; | 111 | struct saa7134_dev *dev = file->private_data; |
112 | 112 | ||
113 | mutex_lock(&dev->empress_tsq.vb_lock); | ||
114 | videobuf_stop(&dev->empress_tsq); | 113 | videobuf_stop(&dev->empress_tsq); |
115 | videobuf_mmap_free(&dev->empress_tsq); | 114 | videobuf_mmap_free(&dev->empress_tsq); |
116 | dev->empress_users--; | 115 | dev->empress_users--; |
@@ -122,7 +121,6 @@ static int ts_release(struct inode *inode, struct file *file) | |||
122 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, | 121 | saa_writeb(SAA7134_AUDIO_MUTE_CTRL, |
123 | saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 << 6)); | 122 | saa_readb(SAA7134_AUDIO_MUTE_CTRL) | (1 << 6)); |
124 | 123 | ||
125 | mutex_unlock(&dev->empress_tsq.vb_lock); | ||
126 | return 0; | 124 | return 0; |
127 | } | 125 | } |
128 | 126 | ||