diff options
Diffstat (limited to 'drivers/media/dvb-core')
-rw-r--r-- | drivers/media/dvb-core/dvb_frontend.c | 5 | ||||
-rw-r--r-- | drivers/media/dvb-core/dvb_net.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c index 57601c0704c1..1f925e856974 100644 --- 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) | |||
2527 | 2527 | ||
2528 | if (dvbdev->users == -1) { | 2528 | if (dvbdev->users == -1) { |
2529 | wake_up(&fepriv->wait_queue); | 2529 | wake_up(&fepriv->wait_queue); |
2530 | if (fepriv->exit != DVB_FE_NO_EXIT) { | 2530 | if (fepriv->exit != DVB_FE_NO_EXIT) |
2531 | fops_put(file->f_op); | ||
2532 | file->f_op = NULL; | ||
2533 | wake_up(&dvbdev->wait_queue); | 2531 | wake_up(&dvbdev->wait_queue); |
2534 | } | ||
2535 | if (fe->ops.ts_bus_ctrl) | 2532 | if (fe->ops.ts_bus_ctrl) |
2536 | fe->ops.ts_bus_ctrl(fe, 0); | 2533 | fe->ops.ts_bus_ctrl(fe, 0); |
2537 | } | 2534 | } |
diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c index c3cc3b52662b..f91c80c0e9ec 100644 --- a/drivers/media/dvb-core/dvb_net.c +++ b/drivers/media/dvb-core/dvb_net.c | |||
@@ -1479,11 +1479,8 @@ static int dvb_net_close(struct inode *inode, struct file *file) | |||
1479 | 1479 | ||
1480 | dvb_generic_release(inode, file); | 1480 | dvb_generic_release(inode, file); |
1481 | 1481 | ||
1482 | if(dvbdev->users == 1 && dvbnet->exit == 1) { | 1482 | if(dvbdev->users == 1 && dvbnet->exit == 1) |
1483 | fops_put(file->f_op); | ||
1484 | file->f_op = NULL; | ||
1485 | wake_up(&dvbdev->wait_queue); | 1483 | wake_up(&dvbdev->wait_queue); |
1486 | } | ||
1487 | return 0; | 1484 | return 0; |
1488 | } | 1485 | } |
1489 | 1486 | ||