diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-25 15:33:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-25 15:33:58 +1100 |
| commit | 2f51276d9133b0069307661d627dba179694e1c3 (patch) | |
| tree | 9091756d87c882da0a8c86617dc553800b1fc1ee /drivers | |
| parent | 3a76a6e6ed4f441caa475a297c7f30b90884a357 (diff) | |
| parent | 1d677ff56f7a9e86ab86bc859a6e667c16c9181c (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; } |