diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-07 16:10:00 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-07 16:10:00 +1100 |
commit | 1d7ef8fdb754ae3b58b4986d1969ef84be9931e5 (patch) | |
tree | 8f3a58b206c5ec731e060b8c90b98c8c4ad56f4f /drivers | |
parent | bf4458cc60b51d548d5df87cb05fe1c89eae9b3c (diff) | |
parent | c15b1841881aa96b0eb364fa51f18de3de52873e (diff) |
Merge remote branch 'tip/auto-latest'
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/nvram.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c index fdbcc9fd6d31..5eb83c3ca20d 100644 --- a/drivers/char/nvram.c +++ b/drivers/char/nvram.c @@ -336,14 +336,12 @@ static int nvram_ioctl(struct inode *inode, struct file *file, static int nvram_open(struct inode *inode, struct file *file) { - lock_kernel(); spin_lock(&nvram_state_lock); if ((nvram_open_cnt && (file->f_flags & O_EXCL)) || (nvram_open_mode & NVRAM_EXCL) || ((file->f_mode & FMODE_WRITE) && (nvram_open_mode & NVRAM_WRITE))) { spin_unlock(&nvram_state_lock); - unlock_kernel(); return -EBUSY; } @@ -354,7 +352,6 @@ static int nvram_open(struct inode *inode, struct file *file) nvram_open_cnt++; spin_unlock(&nvram_state_lock); - unlock_kernel(); return 0; } |