| commit | c9aa1625b747913151db5f51a543cbcc24ca03aa | [log] [tgz] |
|---|---|---|
| author | Mark Brown <broonie@linaro.org> | Thu Mar 13 14:19:02 2014 +0000 |
| committer | Mark Brown <broonie@linaro.org> | Thu Mar 13 14:19:02 2014 +0000 |
| tree | 02ad2843546a53b8c3d303ab8a70c4722abc15fb | |
| parent | dadaa4717b1026fa358c036b939e5548e08d6b53 [diff] | |
| parent | e95d73c437a09e7febea18f8e998f958ef6d7a72 [diff] |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c index f141435..56a5219 100644 --- a/sound/soc/omap/ams-delta.c +++ b/sound/soc/omap/ams-delta.c
@@ -325,7 +325,7 @@ snd_soc_dapm_sync_unlocked(dapm); - snd_soc_dapm_mutex_unlock(codec); + snd_soc_dapm_mutex_unlock(dapm); } /* Line discipline .hangup() */