diff --git a/[refs] b/[refs] index 726ff0961d93..d71810e6dd39 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8ccc51f6fc6cde3644b4a2159fb57fe6c38d465 +refs/heads/master: 3c492d2033f4c67e967e85ff46b8ebac0c5c4036 diff --git a/trunk/drivers/s390/char/vmur.c b/trunk/drivers/s390/char/vmur.c index 77571b68539a..cc56fc708bae 100644 --- a/trunk/drivers/s390/char/vmur.c +++ b/trunk/drivers/s390/char/vmur.c @@ -695,7 +695,6 @@ static int ur_open(struct inode *inode, struct file *file) if (accmode == O_RDWR) return -EACCES; - lock_kernel(); /* * We treat the minor number as the devno of the ur device * to find in the driver tree. @@ -749,7 +748,6 @@ static int ur_open(struct inode *inode, struct file *file) goto fail_urfile_free; urf->file_reclen = rc; file->private_data = urf; - unlock_kernel(); return 0; fail_urfile_free: @@ -761,7 +759,6 @@ static int ur_open(struct inode *inode, struct file *file) fail_put: urdev_put(urd); out: - unlock_kernel(); return rc; }