]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
authorMark Brown <broonie@kernel.org>
Wed, 8 Apr 2015 20:11:13 +0000 (21:11 +0100)
committerMark Brown <broonie@kernel.org>
Wed, 8 Apr 2015 20:11:13 +0000 (21:11 +0100)
1  2 
sound/soc/soc-core.c

index 07aa54385ae0242a2412f0bca9e570772e0877c1,4443581d69f2859e9fec6c322f8212027fd9295f..7e43f1db37c24923ed4bdd66062a697e69b28272
@@@ -1687,8 -1661,9 +1686,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: