From 380672698b8e64f0b5e418412b1ed370bd366428 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 26 Jun 2013 10:12:48 -0700 Subject: Revert "char: misc: assign file->private_data in all cases" This reverts commit 585d98e00ba7a5e2abe65f7a1eff631cb612289b, as it breaks the FUSE misc driver. Reported-by: Sedat Dilek Cc: Thomas Petazzoni Cc: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman diff --git a/drivers/char/misc.c b/drivers/char/misc.c index fd504d3..190d442 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c @@ -143,8 +143,8 @@ static int misc_open(struct inode * inode, struct file * file) err = 0; old_fops = file->f_op; file->f_op = new_fops; - file->private_data = c; if (file->f_op->open) { + file->private_data = c; err=file->f_op->open(inode,file); if (err) { fops_put(file->f_op); -- cgit v0.10.2