From 95f08aff92790808957246c5718c06995d6e28be Mon Sep 17 00:00:00 2001
From: Samu Onkalo <samu.p.onkalo@nokia.com>
Date: Mon, 24 May 2010 14:33:10 -0700
Subject: [PATCH] --- yaml --- r: 198287 b: refs/heads/master c:
 fa1f68db6ca7ebb6fc4487ac215bffba06c01c28 h: refs/heads/master i:   198285:
 c28bd9a468e76543049e1bb0a58301c9970aca56   198283:
 7c4ea73aeb563cdb5b85850eca6d68dedaa62a2a   198279:
 04935ab60ae235e81f6b090a60e3aaae918992f4   198271:
 31a480c05df43b33dfe4a734a3dd0dccb0edaa01 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/char/misc.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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);