Skip to content

Commit

Permalink
ds1286: BKL pushdown
Browse files Browse the repository at this point in the history
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann authored and Jonathan Corbet committed Jun 20, 2008
1 parent 514bcc6 commit 7ccef46
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/char/ds1286.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
* option) any later version.
*/
#include <linux/ds1286.h>
#include <linux/smp_lock.h>
#include <linux/types.h>
#include <linux/errno.h>
#include <linux/miscdevice.h>
Expand Down Expand Up @@ -252,6 +253,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file,

static int ds1286_open(struct inode *inode, struct file *file)
{
lock_kernel();
spin_lock_irq(&ds1286_lock);

if (ds1286_status & RTC_IS_OPEN)
Expand All @@ -260,10 +262,12 @@ static int ds1286_open(struct inode *inode, struct file *file)
ds1286_status |= RTC_IS_OPEN;

spin_unlock_irq(&ds1286_lock);
unlock_kernel();
return 0;

out_busy:
spin_lock_irq(&ds1286_lock);
unlock_kernel();
return -EBUSY;
}

Expand Down

0 comments on commit 7ccef46

Please sign in to comment.