patch-2.4.0-test4 linux/drivers/i2c/i2c-dev.c

Next file: linux/drivers/i2o/i2o_config.c
Previous file: linux/drivers/char/wdt_pci.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.0-test3/linux/drivers/i2c/i2c-dev.c linux/drivers/i2c/i2c-dev.c
@@ -32,6 +32,7 @@
 #include <linux/fs.h>
 #include <linux/malloc.h>
 #include <linux/version.h>
+#include <linux/smp_lock.h>
 
 /* If you want debugging uncomment: */
 /* #define DEBUG */
@@ -76,6 +77,7 @@
 static int i2cdev_cleanup(void);
 
 static struct file_operations i2cdev_fops = {
+	owner:		THIS_MODULE,
 	llseek:		i2cdev_lseek,
 	read:		i2cdev_read,
 	write:		i2cdev_write,
@@ -374,7 +376,6 @@
 
 	if (i2cdev_adaps[minor]->inc_use)
 		i2cdev_adaps[minor]->inc_use(i2cdev_adaps[minor]);
-	MOD_INC_USE_COUNT;
 
 #ifdef DEBUG
 	printk("i2c-dev.o: opened i2c-%d\n",minor);
@@ -390,9 +391,10 @@
 #ifdef DEBUG
 	printk("i2c-dev.o: Closed: i2c-%d\n", minor);
 #endif
-	MOD_DEC_USE_COUNT;
+	lock_kernel();
 	if (i2cdev_adaps[minor]->dec_use)
 		i2cdev_adaps[minor]->dec_use(i2cdev_adaps[minor]);
+	unlock_kernel();
 	return 0;
 }
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)