diff options
| author | Peter Beutner <p.beutner@gmx.net> | 2005-07-07 17:57:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-07 18:23:53 -0700 |
| commit | 761979248adf83f5bece22e058ec445511984012 (patch) | |
| tree | 4afc251120216f74e17272e67263f8b0e5969229 /drivers/media/dvb | |
| parent | 4992775c8287145e86b94fe8d19bbb5f20148cc0 (diff) | |
[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>
Diffstat (limited to 'drivers/media/dvb')
| -rw-r--r-- | drivers/media/dvb/dvb-core/dmxdev.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c index c225de7ffd8..1624f4be5ea 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; } |