evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

media: dvb-core: Add feed state check before stop dvbdemux feed

Browse source 
Add feed state check whether any filter is configured on dvbdemux
feed before feed stop is called. If any filter is started the feed
status should be set to DMX_STATE_GO.

CRs-Fixed: 1090466
Change-Id: If9e87065bb9fb82befb398f2a3a0d0da2f76efa5
Signed-off-by: Udaya Mallavarapu <udaym@codeaurora.org>
This commit is contained in:
Udaya Mallavarapu 2016-12-07 13:16:21 +05:30 • committed by Gerrit - the friendly Code Review server
parent 69352ff8b4
commit 34cbae8bc5
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/media/dvb-core/dvb_demux.c
View file

@ -2840,6 +2840,11 @@ static int dmx_section_feed_stop_filtering(struct dmx_section_feed *feed)
mutex_lock(&dvbdmx->mutex); mutex_lock(&dvbdmx->mutex);
if (dvbdmxfeed->state < DMX_STATE_GO) {
mutex_unlock(&dvbdmx->mutex);
return -EINVAL;
}
if (!dvbdmx->stop_feed) { if (!dvbdmx->stop_feed) {
mutex_unlock(&dvbdmx->mutex); mutex_unlock(&dvbdmx->mutex);
return -ENODEV; return -ENODEV;

8
drivers/media/platform/msm/dvb/demux/mpq_dmx_plugin_common.c
View file

@ -1801,7 +1801,11 @@ int mpq_dmx_terminate_feed(struct dvb_demux_feed *feed)
} }
mpq_sdmx_close_session(mpq_demux); mpq_sdmx_close_session(mpq_demux);
if (mpq_demux->num_secure_feeds > 0)
mpq_demux->num_secure_feeds--; mpq_demux->num_secure_feeds--;
else
MPQ_DVB_DBG_PRINT("%s: Invalid secure feed count= %u\n",
__func__, mpq_demux->num_secure_feeds);
} }
if (dvb_dmx_is_video_feed(feed)) { if (dvb_dmx_is_video_feed(feed)) {
@ -1818,7 +1822,11 @@ int mpq_dmx_terminate_feed(struct dvb_demux_feed *feed)
} }
mpq_sdmx_terminate_metadata_buffer(mpq_feed); mpq_sdmx_terminate_metadata_buffer(mpq_feed);
if (mpq_demux->num_active_feeds > 0)
mpq_demux->num_active_feeds--; mpq_demux->num_active_feeds--;
else
MPQ_DVB_DBG_PRINT("%s: Invalid num_active_feeds count = %u\n",
__func__, mpq_demux->num_active_feeds);
mutex_unlock(&mpq_demux->mutex); mutex_unlock(&mpq_demux->mutex);