From: Mark Brown <broonie@kernel.org>
Date: Thu, 9 Apr 2015 10:23:57 +0000 (+0100)
Subject: Merge tag 'v4.0-rc7' into asoc-core
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=95a9ca74768089d89c17ba958d6f009aa9c18525;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'v4.0-rc7' into asoc-core

Linux 4.0-rc7
---

95a9ca74768089d89c17ba958d6f009aa9c18525
diff --cc sound/soc/soc-core.c
index 4443581d69f2,e5c990889dcc..71585d0562fa
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -1661,9 -1679,8 +1678,10 @@@ static int snd_soc_instantiate_card(str
  	card->instantiated = 1;
  	snd_soc_dapm_sync(&card->dapm);
  	mutex_unlock(&card->mutex);
+ 	mutex_unlock(&client_mutex);
  
 +	soc_init_card_debugfs(card);
 +
  	return 0;
  
  probe_aux_dev_err: