Merge "media: dvb: Fix PID removal from a filter"

11de91ca · Linux Build Service Account · Gerrit - the friendly Code Review server · bd0aeabf · 936608d8 · 11de91ca
Commit 11de91ca authored 12 years ago by Linux Build Service Account Committed by Gerrit - the friendly Code Review server 12 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

drivers/media/dvb/dvb-core/dmxdev.c drivers/media/dvb/dvb-core/dmxdev.c +7 -4

No files found.
--- a/drivers/media/dvb/dvb-core/dmxdev.c
+++ b/drivers/media/dvb/dvb-core/dmxdev.c
@@ -2720,10 +2720,13 @@ static int dvb_dmxdev_remove_pid(struct dmxdev *dmxdev,
 		return -EINVAL;

 	list_for_each_entry_safe(feed, tmp, &filter->feed.ts, next) {
-		if ((feed->pid == pid) && (feed->ts != NULL)) {
-			feed->ts->stop_filtering(feed->ts);
-			filter->dev->demux->release_ts_feed(filter->dev->demux,
-							    feed->ts);
+		if (feed->pid == pid) {
+			if (feed->ts != NULL) {
+				feed->ts->stop_filtering(feed->ts);
+				filter->dev->demux->release_ts_feed(
+							filter->dev->demux,
+							feed->ts);
+			}
 			list_del(&feed->next);
 			kfree(feed);
 		}