diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-13 10:19:02 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 10:19:02 -0400 |
| commit | c9aa1625b747913151db5f51a543cbcc24ca03aa (patch) | |
| tree | 02ad2843546a53b8c3d303ab8a70c4722abc15fb /sound/soc/omap | |
| parent | dadaa4717b1026fa358c036b939e5548e08d6b53 (diff) | |
| parent | e95d73c437a09e7febea18f8e998f958ef6d7a72 (diff) | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/ams-delta.c | 2 |
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) | |||
| 325 | 325 | ||
| 326 | snd_soc_dapm_sync_unlocked(dapm); | 326 | snd_soc_dapm_sync_unlocked(dapm); |
| 327 | 327 | ||
| 328 | snd_soc_dapm_mutex_unlock(codec); | 328 | snd_soc_dapm_mutex_unlock(dapm); |
| 329 | } | 329 | } |
| 330 | 330 | ||
| 331 | /* Line discipline .hangup() */ | 331 | /* Line discipline .hangup() */ |