Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12ba0504 authored by Johannes Stezenbach's avatar Johannes Stezenbach Committed by Linus Torvalds
Browse files

[PATCH] dvb: ttpci: error handling fix 



Change error handling in av7110_stop_feed() to stop as many filters as
possible in case of errors.

Signed-off-by: default avatarJohannes Stezenbach <js@linuxtv.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ce18a223

drivers/media/dvb/ttpci/av7110.c

+7 −8
Original line number Original line Diff line number Diff line
@@ -1050,8 +1050,7 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed) 
{

{

	struct dvb_demux *demux = feed->demux;

	struct dvb_demux *demux = feed->demux;

	struct av7110 *av7110 = demux->priv;

	struct av7110 *av7110 = demux->priv;



	int i, rc, ret = 0;

	int ret = 0;

	dprintk(4, "%p\n", av7110);

	dprintk(4, "%p\n", av7110);





	if (feed->type == DMX_TYPE_TS) {

	if (feed->type == DMX_TYPE_TS) {
@@ -1072,16 +1071,16 @@ static int av7110_stop_feed(struct dvb_demux_feed *feed) 
	}

	}





	if (!ret && feed->type == DMX_TYPE_SEC) {

	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 &&

			if (demux->filter[i].state == DMX_STATE_GO &&

			    demux->filter[i].filter.parent == &feed->feed.sec) {

			    demux->filter[i].filter.parent == &feed->feed.sec) {

				demux->filter[i].state = DMX_STATE_READY;

				demux->filter[i].state = DMX_STATE_READY;

				if (demux->dmx.frontend->source != DMX_MEMORY_FE) {

				if (demux->dmx.frontend->source != DMX_MEMORY_FE) {

					ret = StopHWFilter(&demux->filter[i]);

					rc = StopHWFilter(&demux->filter[i]);

					if (ret)

					if (!ret)

						break;

						ret = rc;

					/* keep going, stop as many filters as possible */

				}

			}

			}

		}

		}

	}

	}