Merge branch 'topic/snd_card_new-err' into topic/asoc

Conflicts:
	sound/soc/soc-core.c

diff --cc sound/pci/hda/hda_intel.c
Simple merge

diff --cc sound/soc/soc-core.c
index f18c7a3e36d1dfb3194cf45b143911ec613b1626,318dfdd54d7f00065002d1d834e382bd827dea07..580a1a534ad03a4e72571e611870d5fcf8570be3
--- 1/sound/soc/soc-core.c
--- 2/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@@ -1306,9 -1309,9 +1306,9 @@@ EXPORT_SYMBOL_GPL(snd_soc_test_bits)
   */
  int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid)
  {
 -      struct snd_soc_codec *codec = socdev->codec;
        struct snd_soc_card *card = socdev->card;
-       int ret = 0, i;
 +      struct snd_soc_codec *codec = card->codec;
+       int ret, i;
  
        mutex_lock(&codec->mutex);
  

diff --cc sound/usb/caiaq/caiaq-device.c
Simple merge