diff options
| author | Jens Axboe <axboe@kernel.dk> | 2014-01-08 09:32:45 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2014-01-08 09:32:45 -0700 |
| commit | 54a387cb9e600256e50cb9e2209e7e4f06f464de (patch) | |
| tree | 37f2b32b1330f51dbe10ccf4300114c72f7aabdc /drivers/media/dvb-core | |
| parent | 8586ea96b4f919a9b38929040bc9ce57c9998fc4 (diff) | |
| parent | 0fec08b4ecfc36fd8a64432343b2964fb86d2675 (diff) | |
Merge branch 'for-3.14/core' into for-3.14/drivers
We need the updated code to make bcache easier to merge.
Diffstat (limited to 'drivers/media/dvb-core')
| -rw-r--r-- | drivers/media/dvb-core/dvb_demux.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/media/dvb-core/dvb_demux.c b/drivers/media/dvb-core/dvb_demux.c index 58de4410c52..6c7ff0cdcd3 100644 --- a/drivers/media/dvb-core/dvb_demux.c +++ b/drivers/media/dvb-core/dvb_demux.c @@ -435,7 +435,7 @@ static void dvb_dmx_swfilter_packet(struct dvb_demux *demux, const u8 *buf) dprintk_tscheck("TEI detected. " "PID=0x%x data1=0x%x\n", pid, buf[1]); - /* data in this packet cant be trusted - drop it unless + /* data in this packet can't be trusted - drop it unless * module option dvb_demux_feed_err_pkts is set */ if (!dvb_demux_feed_err_pkts) return; @@ -1032,8 +1032,13 @@ static int dmx_section_feed_release_filter(struct dmx_section_feed *feed, return -EINVAL; } - if (feed->is_filtering) + if (feed->is_filtering) { + /* release dvbdmx->mutex as far as it is + acquired by stop_filtering() itself */ + mutex_unlock(&dvbdmx->mutex); feed->stop_filtering(feed); + mutex_lock(&dvbdmx->mutex); + } spin_lock_irq(&dvbdmx->lock); f = dvbdmxfeed->filter; |