[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 c225de7ffd82429f61103839a4657df49a440a3c..1624f4be5ea76f77aa8ca43c58696d4b08421cf1 100644 (file)
--- 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;
        }