summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-03-13 14:19:02 +0000
committerMark Brown <broonie@linaro.org>2014-03-13 14:19:02 +0000
commitc9aa1625b747913151db5f51a543cbcc24ca03aa (patch)
tree02ad2843546a53b8c3d303ab8a70c4722abc15fb /sound
parentdadaa4717b1026fa358c036b939e5548e08d6b53 (diff)
parente95d73c437a09e7febea18f8e998f958ef6d7a72 (diff)
downloadlinux-c9aa1625b747913151db5f51a543cbcc24ca03aa.tar.bz2
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/ams-delta.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/omap/ams-delta.c
index f141435b0b4a..56a5219c0a00 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/omap/ams-delta.c
@@ -325,7 +325,7 @@ static void cx81801_close(struct tty_struct *tty)
snd_soc_dapm_sync_unlocked(dapm);
- snd_soc_dapm_mutex_unlock(codec);
+ snd_soc_dapm_mutex_unlock(dapm);
}
/* Line discipline .hangup() */