diff options
Diffstat (limited to 'drivers/hwmon/w83793.c')
| -rw-r--r-- | drivers/hwmon/w83793.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/w83793.c b/drivers/hwmon/w83793.c index 697202e27891..8e540ada47d2 100644 --- a/drivers/hwmon/w83793.c +++ b/drivers/hwmon/w83793.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/slab.h> | 35 | #include <linux/slab.h> |
| 36 | #include <linux/i2c.h> | 36 | #include <linux/i2c.h> |
| 37 | #include <linux/hwmon.h> | 37 | #include <linux/hwmon.h> |
| 38 | #include <linux/smp_lock.h> | ||
| 39 | #include <linux/hwmon-vid.h> | 38 | #include <linux/hwmon-vid.h> |
| 40 | #include <linux/hwmon-sysfs.h> | 39 | #include <linux/hwmon-sysfs.h> |
| 41 | #include <linux/err.h> | 40 | #include <linux/err.h> |
| @@ -52,6 +51,7 @@ | |||
| 52 | #define WATCHDOG_TIMEOUT 2 /* 2 minute default timeout */ | 51 | #define WATCHDOG_TIMEOUT 2 /* 2 minute default timeout */ |
| 53 | 52 | ||
| 54 | /* Addresses to scan */ | 53 | /* Addresses to scan */ |
| 54 | static DEFINE_MUTEX(watchdog_mutex); | ||
| 55 | static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, | 55 | static const unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, 0x2f, |
| 56 | I2C_CLIENT_END }; | 56 | I2C_CLIENT_END }; |
| 57 | 57 | ||
| @@ -1333,7 +1333,7 @@ static long watchdog_ioctl(struct file *filp, unsigned int cmd, | |||
| 1333 | int val, ret = 0; | 1333 | int val, ret = 0; |
| 1334 | struct w83793_data *data = filp->private_data; | 1334 | struct w83793_data *data = filp->private_data; |
| 1335 | 1335 | ||
| 1336 | lock_kernel(); | 1336 | mutex_lock(&watchdog_mutex); |
| 1337 | switch (cmd) { | 1337 | switch (cmd) { |
| 1338 | case WDIOC_GETSUPPORT: | 1338 | case WDIOC_GETSUPPORT: |
| 1339 | if (!nowayout) | 1339 | if (!nowayout) |
| @@ -1387,7 +1387,7 @@ static long watchdog_ioctl(struct file *filp, unsigned int cmd, | |||
| 1387 | default: | 1387 | default: |
| 1388 | ret = -ENOTTY; | 1388 | ret = -ENOTTY; |
| 1389 | } | 1389 | } |
| 1390 | unlock_kernel(); | 1390 | mutex_unlock(&watchdog_mutex); |
| 1391 | return ret; | 1391 | return ret; |
| 1392 | } | 1392 | } |
| 1393 | 1393 | ||
