diff --git a/[refs] b/[refs] index 672e217c5947..c82c3365c34d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a30427d92d0bc152b833088e4a305bbeb1a0c162 +refs/heads/master: 9514dff918b947ae43b66517dc90d0e05548bd6a diff --git a/trunk/fs/char_dev.c b/trunk/fs/char_dev.c index a54d69369b2f..3cb7cda3d780 100644 --- a/trunk/fs/char_dev.c +++ b/trunk/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;