From 2b6002d654cb55126674a66c9ea420d8f6863b6b Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 23 Nov 2007 15:41:44 +0100
Subject: [PATCH] --- yaml --- r: 81520 b: refs/heads/master c:
 3d3909ffe57174ee10a2ba2cdd75a7c7383f1983 h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 61c11d679399..f84dcb025bf1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df86d1149f4b7b77158755b85b85f94e7bade32f
+refs/heads/master: 3d3909ffe57174ee10a2ba2cdd75a7c7383f1983
diff --git a/trunk/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c b/trunk/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c
index a4b0e1acb11d..e6ffea9128c7 100644
--- a/trunk/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c
+++ b/trunk/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c
@@ -996,6 +996,7 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,
 		if (dev->pcm->card != card) {
 			printk(KERN_ERR
 			       "Can't attach same bus to different cards!\n");
+			err = -EINVAL;
 			goto out_put_ci_module;
 		}
 		err = snd_pcm_new_stream(dev->pcm, SNDRV_PCM_STREAM_CAPTURE, 1);