From: Peter Beutner <p.beutner@gmx.net>
Date: Fri, 8 Jul 2005 00:57:38 +0000 (-0700)
Subject: [PATCH] dvb: core: demux error handling fix
X-Git-Tag: v2.6.13-rc3~208
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=761979248adf83f5bece22e058ec445511984012;p=safe%2Fjmp%2Flinux-2.6

[PATCH] dvb: core: demux error handling fix

In dvb_dmxdev_filter_start if we go out because of an error, release
previously allocated demux_feed.

Signed-off-by: Peter Beutner <p.beutner@gmx.net>
Signed-off-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c
index c225de7..1624f4b 100644
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -669,8 +669,10 @@ static int dvb_dmxdev_filter_start(struct dmxdev_filter *filter)
 
 		ret = filter->feed.ts->start_filtering(filter->feed.ts);
 
-		if (ret < 0)
+		if (ret < 0) {
+			dmxdev->demux->release_ts_feed(dmxdev->demux, *tsfeed);
 			return ret;
+		}
 
 		break;
 	}