From: Martin Kepplinger Date: Wed, 29 Oct 2014 19:22:56 +0000 (+0100) Subject: misc: always assign miscdevice to file->private_data in open() X-Git-Tag: firefly_0821_release~176^2~2676^2~54 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=32eca22180804f71b06b63fd29b72f58be8b3c47;p=firefly-linux-kernel-4.4.55.git misc: always assign miscdevice to file->private_data in open() As of now, a miscdevice driver has to provide an implementation of the open() file operation if it wants to have misc_open() assign a pointer to struct miscdevice to file->private_data for other file operations to use (given the user calls open()). This leads to situations where a miscdevice driver that doesn't need internal operations during open() has to implement open() that only returns immediately, in order to use the data in private_data in other fops. This provides consistent behaviour for miscdevice developers and will always provide the pointer in private_data. A driver's open() fop would, of course, just overwrite it, when using private_data itself. Signed-off-by: Martin Kepplinger Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/char/misc.c b/drivers/char/misc.c index ffa97d261cf3..205ad4c58470 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: