patch-2.4.0-test5 linux/drivers/char/tvmixer.c

• Lines: 32
• Date: Tue Jul 18 22:35:33 2000
• Orig file: v2.4.0-test4/linux/drivers/char/tvmixer.c
• Orig date: Fri Jul 14 12:12:09 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/char/tvmixer.c linux/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_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)