diff --git a/[refs] b/[refs] index 4cfb6fc5f9c0..e101c6dde72d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c5e303afdf2910e58aeda56c10506342545a5af +refs/heads/master: fa1f68db6ca7ebb6fc4487ac215bffba06c01c28 diff --git a/trunk/drivers/char/misc.c b/trunk/drivers/char/misc.c index 92ab03d28294..cd650ca8c679 100644 --- a/trunk/drivers/char/misc.c +++ b/trunk/drivers/char/misc.c @@ -144,6 +144,7 @@ static int misc_open(struct inode * inode, struct file * file) old_fops = file->f_op; file->f_op = new_fops; if (file->f_op->open) { + file->private_data = c; err=file->f_op->open(inode,file); if (err) { fops_put(file->f_op);