Merge branch 'topic/snd_card_new-err' into topic/asoc
Takashi Iwai [Wed, 28 Jan 2009 07:08:32 +0000 (08:08 +0100)]
Conflicts:
sound/soc/soc-core.c

1  2 
sound/pci/hda/hda_intel.c
sound/soc/soc-core.c
sound/usb/caiaq/caiaq-device.c

Simple merge
@@@ -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;
 +      struct snd_soc_codec *codec = card->codec;
-       int ret = 0, i;
+       int ret, i;
  
        mutex_lock(&codec->mutex);
  
Simple merge