diff options
Diffstat (limited to 'drivers/hwmon/fschmd.c')
-rw-r--r-- | drivers/hwmon/fschmd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/fschmd.c b/drivers/hwmon/fschmd.c index b7ca2a9676cf..d4d4ca65d371 100644 --- a/drivers/hwmon/fschmd.c +++ b/drivers/hwmon/fschmd.c | |||
@@ -38,7 +38,6 @@ | |||
38 | #include <linux/i2c.h> | 38 | #include <linux/i2c.h> |
39 | #include <linux/hwmon.h> | 39 | #include <linux/hwmon.h> |
40 | #include <linux/hwmon-sysfs.h> | 40 | #include <linux/hwmon-sysfs.h> |
41 | #include <linux/smp_lock.h> | ||
42 | #include <linux/err.h> | 41 | #include <linux/err.h> |
43 | #include <linux/mutex.h> | 42 | #include <linux/mutex.h> |
44 | #include <linux/sysfs.h> | 43 | #include <linux/sysfs.h> |
@@ -50,6 +49,7 @@ | |||
50 | #include <linux/kref.h> | 49 | #include <linux/kref.h> |
51 | 50 | ||
52 | /* Addresses to scan */ | 51 | /* Addresses to scan */ |
52 | static DEFINE_MUTEX(watchdog_mutex); | ||
53 | static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END }; | 53 | static const unsigned short normal_i2c[] = { 0x73, I2C_CLIENT_END }; |
54 | 54 | ||
55 | /* Insmod parameters */ | 55 | /* Insmod parameters */ |
@@ -858,7 +858,7 @@ static long watchdog_ioctl(struct file *filp, unsigned int cmd, unsigned long ar | |||
858 | int i, ret = 0; | 858 | int i, ret = 0; |
859 | struct fschmd_data *data = filp->private_data; | 859 | struct fschmd_data *data = filp->private_data; |
860 | 860 | ||
861 | lock_kernel(); | 861 | mutex_lock(&watchdog_mutex); |
862 | switch (cmd) { | 862 | switch (cmd) { |
863 | case WDIOC_GETSUPPORT: | 863 | case WDIOC_GETSUPPORT: |
864 | ident.firmware_version = data->revision; | 864 | ident.firmware_version = data->revision; |
@@ -915,7 +915,7 @@ static long watchdog_ioctl(struct file *filp, unsigned int cmd, unsigned long ar | |||
915 | default: | 915 | default: |
916 | ret = -ENOTTY; | 916 | ret = -ENOTTY; |
917 | } | 917 | } |
918 | unlock_kernel(); | 918 | mutex_unlock(&watchdog_mutex); |
919 | return ret; | 919 | return ret; |
920 | } | 920 | } |
921 | 921 | ||