| commit | e8505acfb419f50b9af6da2c7f2cebfbcff0bfc5 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Wed Jan 30 05:05:48 2013 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Wed Jan 30 05:05:47 2013 -0800 |
| tree | 553c71d67746be35ee61685d2fd6d604db6da224 | |
| parent | 80bc01fc5a1d71dcf01e1a3b8b6043a9cf420c1b [diff] | |
| parent | 3839a12c62dfdb1563bfc70229dddd9349b89084 [diff] |
Merge "media: dvb: mpq: Fix mutex release"
diff --git a/drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.c b/drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.c index 615342c..992d89b 100644 --- a/drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.c +++ b/drivers/media/dvb/mpq/demux/mpq_dmx_plugin_common.c
@@ -2072,7 +2072,8 @@ return -EINVAL; } - mutex_unlock(&mpq_demux->mutex); + if (!was_locked) + mutex_unlock(&mpq_demux->mutex); return 0; } EXPORT_SYMBOL(mpq_dmx_decoder_fullness_wait);