diff options
| author | Johannes Stezenbach <devnull@localhost> | 2005-06-19 12:59:12 +0000 |
|---|---|---|
| committer | Johannes Stezenbach <devnull@localhost> | 2005-06-19 12:59:12 +0000 |
| commit | 636000dc6b3d1526444a3eb74b00fed562df3011 (patch) | |
| tree | 6bfd3096a1494181704c2612ca09f52d4382a083 /linux/drivers | |
| parent | 56889a57b36f71d25dc4c21790cd94b453871911 (diff) | |
| download | mediapointer-dvb-s2-636000dc6b3d1526444a3eb74b00fed562df3011.tar.gz mediapointer-dvb-s2-636000dc6b3d1526444a3eb74b00fed562df3011.tar.bz2 | |
Change error handling in av7110_stop_feed() to stop as
many filters as possible in case of errors.
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/dvb/ttpci/av7110.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/linux/drivers/media/dvb/ttpci/av7110.c b/linux/drivers/media/dvb/ttpci/av7110.c index 24ba12286..1d1831458 100644 --- a/linux/drivers/media/dvb/ttpci/av7110.c +++ b/linux/drivers/media/dvb/ttpci/av7110.c @@ -1050,8 +1050,7 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed) { struct dvb_demux *demux = feed->demux; struct av7110 *av7110 = demux->priv; - - int ret = 0; + int i, rc, ret = 0; dprintk(4, "%p\n", av7110); if (feed->type == DMX_TYPE_TS) { @@ -1072,17 +1071,17 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed) } if (!ret && feed->type == DMX_TYPE_SEC) { - int i; - - for (i = 0; i<demux->filternum; i++) + for (i = 0; i<demux->filternum; i++) { if (demux->filter[i].state == DMX_STATE_GO && demux->filter[i].filter.parent == &feed->feed.sec) { demux->filter[i].state = DMX_STATE_READY; if (demux->dmx.frontend->source != DMX_MEMORY_FE) { - ret = StopHWFilter(&demux->filter[i]); - if (ret) - break; + rc = StopHWFilter(&demux->filter[i]); + if (!ret) + ret = rc; + /* keep going, stop as many filters as possible */ } + } } } |