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

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

diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
index 83a23afb13ab7f82e51f1dcba32b7de317af3557..f91c80c0e9ec0899816ea177dc616e4aa2b2755d 100644 (file)
--- a/drivers/media/dvb-core/dvb_net.c
+++ b/drivers/media/dvb-core/dvb_net.c
@@ -1044,7 +1044,7 @@ static int dvb_net_feed_start(struct net_device *dev)
                ret = priv->tsfeed->set(priv->tsfeed,
                                        priv->pid, /* pid */
                                        TS_PACKET, /* type */
-                                       DMX_TS_PES_OTHER, /* pes type */
+                                       DMX_PES_OTHER, /* pes type */
                                        32768,     /* circular buffer size */
                                        timeout    /* timeout */
                                        );
@@ -1479,11 +1479,8 @@ static int dvb_net_close(struct inode *inode, struct file *file)
 
        dvb_generic_release(inode, file);
 
-       if(dvbdev->users == 1 && dvbnet->exit == 1) {
-               fops_put(file->f_op);
-               file->f_op = NULL;
+       if(dvbdev->users == 1 && dvbnet->exit == 1)
                wake_up(&dvbdev->wait_queue);
-       }
        return 0;
 }