aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-09-22 14:33:32 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2013-10-24 23:34:53 -0400
commit79b185dd1a40cf360c9d88ada7ed21f79d818613 (patch)
tree8865b6c51a586fb888737308c41d95fa510010ba
parente84f9e57b90ca89664d733a7cef19aa7ccd832f3 (diff)
dmxdev: get rid of pointless clearing ->f_op
nobody else will see that struct file after return from ->release() anyway; just leave ->f_op as is and let __fput() do that fops_put(). Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--drivers/media/dvb-core/dmxdev.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 0b4616b87195..c0363f1b6c90 100644
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -206,8 +206,6 @@ static int dvb_dvr_release(struct inode *inode, struct file *file)
206 /* TODO */ 206 /* TODO */
207 dvbdev->users--; 207 dvbdev->users--;
208 if (dvbdev->users == 1 && dmxdev->exit == 1) { 208 if (dvbdev->users == 1 && dmxdev->exit == 1) {
209 fops_put(file->f_op);
210 file->f_op = NULL;
211 mutex_unlock(&dmxdev->mutex); 209 mutex_unlock(&dmxdev->mutex);
212 wake_up(&dvbdev->wait_queue); 210 wake_up(&dvbdev->wait_queue);
213 } else 211 } else
@@ -1120,8 +1118,6 @@ static int dvb_demux_release(struct inode *inode, struct file *file)
1120 mutex_lock(&dmxdev->mutex); 1118 mutex_lock(&dmxdev->mutex);
1121 dmxdev->dvbdev->users--; 1119 dmxdev->dvbdev->users--;
1122 if(dmxdev->dvbdev->users==1 && dmxdev->exit==1) { 1120 if(dmxdev->dvbdev->users==1 && dmxdev->exit==1) {
1123 fops_put(file->f_op);
1124 file->f_op = NULL;
1125 mutex_unlock(&dmxdev->mutex); 1121 mutex_unlock(&dmxdev->mutex);
1126 wake_up(&dmxdev->dvbdev->wait_queue); 1122 wake_up(&dmxdev->dvbdev->wait_queue);
1127 } else 1123 } else