From 1451f61c679355f373a349c616d738a7c227a303 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 12 Jan 2009 15:18:28 +0100
Subject: [PATCH] --- yaml --- r: 132722 b: refs/heads/master c:
 6ff1871617a3ea1eeaf88b42f652f9a311826bad h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/go7007/snd-go7007.c | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7f52adea2335..207b77304038 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 758021bfa9ea25c58e62d2f68512628b19502ce7
+refs/heads/master: 6ff1871617a3ea1eeaf88b42f652f9a311826bad
diff --git a/trunk/drivers/staging/go7007/snd-go7007.c b/trunk/drivers/staging/go7007/snd-go7007.c
index a7de401f61ab..cd19be6c00e0 100644
--- a/trunk/drivers/staging/go7007/snd-go7007.c
+++ b/trunk/drivers/staging/go7007/snd-go7007.c
@@ -248,10 +248,11 @@ int go7007_snd_init(struct go7007 *go)
 	spin_lock_init(&gosnd->lock);
 	gosnd->hw_ptr = gosnd->w_idx = gosnd->avail = 0;
 	gosnd->capturing = 0;
-	gosnd->card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0);
-	if (gosnd->card == NULL) {
+	ret = snd_card_create(index[dev], id[dev], THIS_MODULE, 0,
+			      &gosnd->card);
+	if (ret < 0) {
 		kfree(gosnd);
-		return -ENOMEM;
+		return ret;
 	}
 	ret = snd_device_new(gosnd->card, SNDRV_DEV_LOWLEVEL, go,
 			&go7007_snd_device_ops);