Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux...

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

diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index d81dbb22aa814fd0b92f8e9c089a9c2f2550ce16..a1a3a5159d71f1ffc3ab244232bf68b6877d5f50 100644 (file)
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -569,7 +569,7 @@ static int dvb_dmxdev_start_feed(struct dmxdev *dmxdev,
        dmx_output_t otype;
        int ret;
        int ts_type;
-       dmx_pes_type_t ts_pes;
+       enum dmx_ts_pes ts_pes;
        struct dmx_ts_feed *tsfeed;
 
        feed->ts = NULL;
@@ -852,7 +852,8 @@ static int dvb_dmxdev_filter_set(struct dmxdev *dmxdev,
                                 struct dmxdev_filter *dmxdevfilter,
                                 struct dmx_sct_filter_params *params)
 {
-       dprintk("function : %s\n", __func__);
+       dprintk("function : %s, PID=0x%04x, flags=%02x, timeout=%d\n",
+               __func__, params->pid, params->flags, params->timeout);
 
        dvb_dmxdev_filter_stop(dmxdevfilter);