aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb-core/dmxdev.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@s-opensource.com>2016-10-13 06:14:38 -0400
committerMauro Carvalho Chehab <mchehab@s-opensource.com>2016-10-21 06:43:24 -0400
commitdd79d27e1bbded7366ade6d25fbfde305e33fad8 (patch)
tree36418da9a4f875830d93fad51f86854ab1f8de4b /drivers/media/dvb-core/dmxdev.c
parent801edd6bb9b223390028dc7f565904a2833d20e1 (diff)
[media] dvb-core: get rid of demux optional circular buffer
There is a provision at the dvb_demux.c to use a vmalloc'ed circular buffer, enabled via an extra #ifdef option that it is not at Kconfig. Enabling it will only make the Kernel to allocate/deallocate such buffer, but no code would actually use it. So, no practical effect, except for sparing some memory without any good reason. So, get rid of such dead code. Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Diffstat (limited to 'drivers/media/dvb-core/dmxdev.c')
-rw-r--r--drivers/media/dvb-core/dmxdev.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c
index 1e96a6f1b6f0..efe55a3e80d0 100644
--- a/drivers/media/dvb-core/dmxdev.c
+++ b/drivers/media/dvb-core/dmxdev.c
@@ -595,7 +595,7 @@ static int dvb_dmxdev_start_feed(struct dmxdev *dmxdev,
595 tsfeed = feed->ts; 595 tsfeed = feed->ts;
596 tsfeed->priv = filter; 596 tsfeed->priv = filter;
597 597
598 ret = tsfeed->set(tsfeed, feed->pid, ts_type, ts_pes, 32768, timeout); 598 ret = tsfeed->set(tsfeed, feed->pid, ts_type, ts_pes, timeout);
599 if (ret < 0) { 599 if (ret < 0) {
600 dmxdev->demux->release_ts_feed(dmxdev->demux, tsfeed); 600 dmxdev->demux->release_ts_feed(dmxdev->demux, tsfeed);
601 return ret; 601 return ret;
@@ -666,7 +666,7 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
666 return ret; 666 return ret;
667 } 667 }
668 668
669 ret = (*secfeed)->set(*secfeed, para->pid, 32768, 669 ret = (*secfeed)->set(*secfeed, para->pid,
670 (para->flags & DMX_CHECK_CRC) ? 1 : 0); 670 (para->flags & DMX_CHECK_CRC) ? 1 : 0);
671 if (ret < 0) { 671 if (ret < 0) {
672 pr_err("DVB (%s): could not set feed\n", 672 pr_err("DVB (%s): could not set feed\n",