Commit 41012735 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jonathan Corbet

rtc-rtc-m41t80: BKL pushdown

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 4333deee
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/smp_lock.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/rtc.h> #include <linux/rtc.h>
...@@ -655,12 +656,16 @@ static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, ...@@ -655,12 +656,16 @@ static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
static int wdt_open(struct inode *inode, struct file *file) static int wdt_open(struct inode *inode, struct file *file)
{ {
if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) { if (MINOR(inode->i_rdev) == WATCHDOG_MINOR) {
if (test_and_set_bit(0, &wdt_is_open)) lock_kernel();
if (test_and_set_bit(0, &wdt_is_open)) {
unlock_kernel();
return -EBUSY; return -EBUSY;
}
/* /*
* Activate * Activate
*/ */
wdt_is_open = 1; wdt_is_open = 1;
unlock_kernel();
return 0; return 0;
} }
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment