From: Thomas Petazzoni Date: Fri, 21 Jun 2013 13:01:05 +0000 (+0200) Subject: char: misc: assign file->private_data in all cases X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~75^2~9 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=585d98e00ba7a5e2abe65f7a1eff631cb612289b;p=pandora-kernel.git char: misc: assign file->private_data in all cases In fa1f68db6ca ("drivers: misc: pass miscdevice pointer via file private data"), the misc driver infrastructure was changed to assigned file->private_data as a pointer to the 'struct miscdevice' that corresponds to the device being opened. However, this assignment was only done when the misc driver was declaring a driver-specific ->open() operation in its file_operations. This doesn't make sense, as the driver may not necessarily have a custom ->open() operation, and might still be interested in having file->private_data properly set for use in its ->read() and write() operations. Therefore, we move the assignment of file->private_data outside of the condition that tests whether a driver-specific ->open() operation was defined. Signed-off-by: Thomas Petazzoni Acked-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- Reading git-diff-tree failed