]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Revert "misc: always assign miscdevice to file->private_data in open()"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Nov 2014 00:49:49 +0000 (16:49 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Nov 2014 00:49:49 +0000 (16:49 -0800)
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>
drivers/char/misc.c

index 205ad4c584708257578d519e895b6be3a52bbe89..ffa97d261cf3322615bc403931d99c71d1896a50 100644 (file)
@@ -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: