Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[karo-tx-linux.git] / drivers / media / dvb-core / dvb_frontend.c

diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c
index 57601c0704c1694637d4a8b15b3da1d1dc7bdb16..1f925e856974936914a7fdb5299bda2a4a84bd59 100644 (file)
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -2527,11 +2527,8 @@ static int dvb_frontend_release(struct inode *inode, struct file *file)
 
        if (dvbdev->users == -1) {
                wake_up(&fepriv->wait_queue);
-               if (fepriv->exit != DVB_FE_NO_EXIT) {
-                       fops_put(file->f_op);
-                       file->f_op = NULL;
+               if (fepriv->exit != DVB_FE_NO_EXIT)
                        wake_up(&dvbdev->wait_queue);
-               }
                if (fe->ops.ts_bus_ctrl)
                        fe->ops.ts_bus_ctrl(fe, 0);
        }