diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/ttpci/av7110.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index e21deee9a985..87767af7207c 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
@@ -1050,8 +1050,7 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed) | |||
1050 | { | 1050 | { |
1051 | struct dvb_demux *demux = feed->demux; | 1051 | struct dvb_demux *demux = feed->demux; |
1052 | struct av7110 *av7110 = demux->priv; | 1052 | struct av7110 *av7110 = demux->priv; |
1053 | 1053 | int i, rc, ret = 0; | |
1054 | int ret = 0; | ||
1055 | dprintk(4, "%p\n", av7110); | 1054 | dprintk(4, "%p\n", av7110); |
1056 | 1055 | ||
1057 | if (feed->type == DMX_TYPE_TS) { | 1056 | if (feed->type == DMX_TYPE_TS) { |
@@ -1072,17 +1071,17 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed) | |||
1072 | } | 1071 | } |
1073 | 1072 | ||
1074 | if (!ret && feed->type == DMX_TYPE_SEC) { | 1073 | if (!ret && feed->type == DMX_TYPE_SEC) { |
1075 | int i; | 1074 | for (i = 0; i<demux->filternum; i++) { |
1076 | |||
1077 | for (i = 0; i<demux->filternum; i++) | ||
1078 | if (demux->filter[i].state == DMX_STATE_GO && | 1075 | if (demux->filter[i].state == DMX_STATE_GO && |
1079 | demux->filter[i].filter.parent == &feed->feed.sec) { | 1076 | demux->filter[i].filter.parent == &feed->feed.sec) { |
1080 | demux->filter[i].state = DMX_STATE_READY; | 1077 | demux->filter[i].state = DMX_STATE_READY; |
1081 | if (demux->dmx.frontend->source != DMX_MEMORY_FE) { | 1078 | if (demux->dmx.frontend->source != DMX_MEMORY_FE) { |
1082 | ret = StopHWFilter(&demux->filter[i]); | 1079 | rc = StopHWFilter(&demux->filter[i]); |
1083 | if (ret) | 1080 | if (!ret) |
1084 | break; | 1081 | ret = rc; |
1082 | /* keep going, stop as many filters as possible */ | ||
1085 | } | 1083 | } |
1084 | } | ||
1086 | } | 1085 | } |
1087 | } | 1086 | } |
1088 | 1087 | ||