Change error handling in av7110_stop_feed() to stop as
many filters as possible in case of errors.
Signed-off-by: Johannes Stezenbach <[email protected]>
drivers/media/dvb/ttpci/av7110.c | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
Index: linux-2.6.12-git8/drivers/media/dvb/ttpci/av7110.c
===================================================================
--- linux-2.6.12-git8.orig/drivers/media/dvb/ttpci/av7110.c 2005-06-27 13:24:21.000000000 +0200
+++ linux-2.6.12-git8/drivers/media/dvb/ttpci/av7110.c 2005-06-27 13:24:22.000000000 +0200
@@ -1050,8 +1050,7 @@ static int av7110_stop_feed(struct dvb_d
{
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_d
}
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 */
}
+ }
}
}
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
