]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
[media] lmedm04 DM04/QQBOX ver 1.91 turn pid filter off by caps option only
authorMalcolm Priestley <tvboxspy@gmail.com>
Fri, 30 Dec 2011 14:33:03 +0000 (11:33 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Fri, 6 Jan 2012 13:39:01 +0000 (11:39 -0200)
Turn the pid filter off by caps option only.

This is so the full stream is passed to demuxer and not limited
by pid count.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/dvb-usb/lmedm04.c

index b9228240f5ce4c84b8ae1ef8659c52a4ace9fda3..767c87f2478607ce5e94ba986aac0da3260cf268 100644 (file)
@@ -388,8 +388,7 @@ static int lme2510_pid_filter(struct dvb_usb_adapter *adap, int index, u16 pid,
        deb_info(3, "%s PID=%04x Index=%04x onoff=%02x", __func__,
                pid, index, onoff);
 
-       if (onoff)
-               if (!pid_filter) {
+       if (onoff) {
                        ret = mutex_lock_interruptible(&adap->dev->i2c_mutex);
                        if (ret < 0)
                                return -EAGAIN;
@@ -654,6 +653,9 @@ static int lme2510_identify_state(struct usb_device *udev,
                struct dvb_usb_device_description **desc,
                int *cold)
 {
+       if (pid_filter > 0)
+               props->adapter[0].fe[0].caps &=
+                       ~DVB_USB_ADAP_NEED_PID_FILTERING;
        *cold = 0;
        return 0;
 }
@@ -1312,5 +1314,5 @@ module_exit(lme2510_module_exit);
 
 MODULE_AUTHOR("Malcolm Priestley <tvboxspy@gmail.com>");
 MODULE_DESCRIPTION("LME2510(C) DVB-S USB2.0");
-MODULE_VERSION("1.90");
+MODULE_VERSION("1.91");
 MODULE_LICENSE("GPL");