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

Commit 8c9bfb8c 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 state when reusing decoder buffer"

parents 365b4131 23a035e4

drivers/media/dvb-core/dmxdev.c

+3 −3
Original line number Diff line number Diff line
@@ -1931,7 +1931,8 @@ static int dvb_dmxdev_reuse_decoder_buf(struct dmxdev_filter *dmxdevfilter, 
{

	struct dmxdev_feed *feed;



	if ((dmxdevfilter->type != DMXDEV_TYPE_PES) ||

	if (dmxdevfilter->state != DMXDEV_STATE_GO ||

		(dmxdevfilter->type != DMXDEV_TYPE_PES) ||

		(dmxdevfilter->params.pes.output != DMX_OUT_DECODER) ||

		(dmxdevfilter->events.event_mask.disable_mask &

			DMX_EVENT_NEW_ES_DATA))
@@ -1940,8 +1941,7 @@ static int dvb_dmxdev_reuse_decoder_buf(struct dmxdev_filter *dmxdevfilter, 
	/* Only one feed should be in the list in case of decoder */

	feed = list_first_entry(&dmxdevfilter->feed.ts,

				struct dmxdev_feed, next);



	if (feed->ts->reuse_decoder_buffer)

	if (feed && feed->ts && feed->ts->reuse_decoder_buffer)

		return feed->ts->reuse_decoder_buffer(feed->ts, cookie);



	return -ENODEV;