summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-14 16:49:49 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-14 16:49:49 -0800
commite88b1fc6a1c1d088824eb4869a70c374da9ebc86 (patch)
tree35db9cac722577d116112db2c825e395e9ca6fb0 /drivers/char
parent4bc33a2cd5070188c79029a8a9f2058dfd2a79a8 (diff)
Revert "misc: always assign miscdevice to file->private_data in open()"
This reverts commit 32eca22180804f71b06b63fd29b72f58be8b3c47. Changing core kernel code to operate in a different manner, without a build-time breakage is tough to do and ensure you got it right. There are lots of problems popping up due to this change, so let's revert it for now as it is not safe to merge to the tree at this point in time. Cc: Martin Kepplinger <martink@posteo.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/misc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/misc.c b/drivers/char/misc.c
index 205ad4c58470..ffa97d261cf3 100644
--- a/drivers/char/misc.c
+++ b/drivers/char/misc.c
@@ -142,8 +142,8 @@ static int misc_open(struct inode * inode, struct file * file)
err = 0;
replace_fops(file, new_fops);
- file->private_data = c;
if (file->f_op->open) {
+ file->private_data = c;
err = file->f_op->open(inode,file);
}
fail: