From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 28 Jan 2009 07:08:32 +0000 (+0100)
Subject: Merge branch 'topic/snd_card_new-err' into topic/asoc
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=67fcdead3c7424d51e7108c220c9ab1a5e752ed3;p=linux-2.6-omap-h63xx.git

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

Conflicts:
	sound/soc/soc-core.c
---

67fcdead3c7424d51e7108c220c9ab1a5e752ed3
diff --cc sound/soc/soc-core.c
index f18c7a3e36d,318dfdd54d7..580a1a534ad
--- a/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;
 +	struct snd_soc_codec *codec = card->codec;
- 	int ret = 0, i;
+ 	int ret, i;
  
  	mutex_lock(&codec->mutex);