author: Jonathan Corbet <corbet@lwn.net> 2008-05-18 15:40:00 -0600
committer: Jonathan Corbet <corbet@lwn.net> 2008-06-20 14:05:53 -0600
commit: 9514dff918b947ae43b66517dc90d0e05548bd6a
parent: a30427d92d0bc152b833088e4a305bbeb1a0c162
Commit Summary:
Diffstat:
1 file changed, 1 insertion, 4 deletions
diff --git a/fs/char_dev.c b/fs/char_dev.c
index a54d69369b2f..3cb7cda3d780 100644
--- a/fs/char_dev.c
+++ b/fs/char_dev.c
@@ -394,11 +394,8 @@ static int chrdev_open(struct inode *inode, struct file *filp)
cdev_put(p);
return -ENXIO;
}
- if (filp->f_op->open) {
- lock_kernel();
+ if (filp->f_op->open)
ret = filp->f_op->open(inode,filp);
- unlock_kernel();
- }
if (ret)
cdev_put(p);
return ret;