summaryrefslogtreecommitdiffstats
path: root/drivers/char/tvmixer.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/tvmixer.c')
-rw-r--r--drivers/char/tvmixer.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/char/tvmixer.c b/drivers/char/tvmixer.c
index c3db65bae..e1034a152 100644
--- a/drivers/char/tvmixer.c
+++ b/drivers/char/tvmixer.c
@@ -7,7 +7,6 @@
#include <linux/errno.h>
#include <linux/malloc.h>
#include <linux/i2c.h>
-#include <linux/smp_lock.h>
#include <linux/videodev.h>
#include <asm/semaphore.h>
#include <linux/init.h>
@@ -220,20 +219,17 @@ static int tvmixer_open(struct inode *inode, struct file *file)
static int tvmixer_release(struct inode *inode, struct file *file)
{
- struct TVMIXER *mix = file->private_data;
+ struct TVMIXER *mix = file->private_data;
struct i2c_client *client;
- lock_kernel();
client = mix->dev;
if (NULL == client) {
- unlock_kernel();
return -ENODEV;
}
- if (client->adapter->dec_use)
+ if (client->adapter->dec_use)
client->adapter->dec_use(client->adapter);
- unlock_kernel();
- return 0;
+ return 0;
}
static loff_t tvmixer_llseek(struct file *file, loff_t offset, int origin)