aboutsummaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorJonathan Corbet <corbet@lwn.net>2008-05-15 11:16:21 -0600
committerJonathan Corbet <corbet@lwn.net>2008-06-20 14:05:48 -0600
commit2d863e92ec1b1deb8167d7f5266f754f258e876a (patch)
tree03022f90fa2f46ed293fe1d9087794d002afcc86 /drivers/char
parent309c4551c0fa0897d5343c36cbfbfa39f1f41b88 (diff)
viotape: cdev lock_kernel pushdown ()
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/viotape.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 58aad63831f..af03d270930 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -46,6 +46,7 @@
#include <linux/completion.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
+#include <linux/smp_lock.h>
#include <asm/uaccess.h>
#include <asm/ioctls.h>
@@ -687,6 +688,7 @@ static int viotap_open(struct inode *inode, struct file *file)
if (op == NULL)
return -ENOMEM;
+ lock_kernel()
get_dev_info(file->f_path.dentry->d_inode, &devi);
/* Note: We currently only support one mode! */
@@ -717,6 +719,7 @@ static int viotap_open(struct inode *inode, struct file *file)
free_op:
free_op_struct(op);
+ unlock_kernel();
return ret;
}