Skip to content

L
linux-davinci
Commit 7ccef463 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Jonathan Corbet
Browse files
Options

ds1286: BKL pushdown 

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 514bcc66
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
drivers/char/ds1286.c
View file @ 7ccef463
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
* option) any later version. * option) any later version.
*/ */
#include <linux/ds1286.h> #include <linux/ds1286.h>
#include <linux/smp_lock.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/miscdevice.h> #include <linux/miscdevice.h>
...@@ -252,6 +253,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file, ...@@ -252,6 +253,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file,
static int ds1286_open(struct inode *inode, struct file *file) static int ds1286_open(struct inode *inode, struct file *file)
{ {
lock_kernel();
spin_lock_irq(&ds1286_lock); spin_lock_irq(&ds1286_lock);
if (ds1286_status & RTC_IS_OPEN) if (ds1286_status & RTC_IS_OPEN)
...@@ -260,10 +262,12 @@ static int ds1286_open(struct inode *inode, struct file *file) ...@@ -260,10 +262,12 @@ static int ds1286_open(struct inode *inode, struct file *file)
ds1286_status |= RTC_IS_OPEN; ds1286_status |= RTC_IS_OPEN;
spin_unlock_irq(&ds1286_lock); spin_unlock_irq(&ds1286_lock);
unlock_kernel();
return 0; return 0;
out_busy: out_busy:
spin_lock_irq(&ds1286_lock); spin_lock_irq(&ds1286_lock);
unlock_kernel();
return -EBUSY; return -EBUSY;
} }
......
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