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

Commit 895f51c5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "media: dvb: Verify filter is still active after stalling"

parents af048988 02eb37ee
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -4036,6 +4036,13 @@ static int mpq_sdmx_section_filtering(struct mpq_feed *mpq_feed,
				__func__);
			return ret;
		}

		if (mpq_feed->sdmx_filter_handle ==
			SDMX_INVALID_FILTER_HANDLE) {
			MPQ_DVB_DBG_PRINT("%s: filter was stopped\n",
				__func__);
			return -ENODEV;
		}
	}

	if (mpq_feed->sdmx_buf.pread + header->payload_length <
@@ -4089,6 +4096,13 @@ static int mpq_sdmx_check_ts_stall(struct mpq_demux *mpq_demux,

		mutex_lock(&mpq_demux->mutex);

		if (mpq_feed->sdmx_filter_handle ==
			SDMX_INVALID_FILTER_HANDLE) {
			MPQ_DVB_DBG_PRINT("%s: filter was stopped\n",
					__func__);
			return -ENODEV;
		}

		return ret;
	}