From aa805ee815e7246152637c73b085284625d4f75d Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Fri, 2 Apr 2010 14:47:59 +0200
Subject: [PATCH] --- yaml --- r: 189585 b: refs/heads/master c:
 a0fd4345f928d72a56e27b23e4cd28c94bf36be5 h: refs/heads/master i:   189583:
 2279397408957c5836a4647e25b185b2f4198a86 v: v3

---
 [refs]                                | 2 +-
 trunk/sound/pci/echoaudio/echoaudio.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 820174ac4c64..e665e5566be0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f11947c7c5b8abffd328739996dfdffef2b3e03f
+refs/heads/master: a0fd4345f928d72a56e27b23e4cd28c94bf36be5
diff --git a/trunk/sound/pci/echoaudio/echoaudio.c b/trunk/sound/pci/echoaudio/echoaudio.c
index 8dab82d7d19d..668a5ec04499 100644
--- a/trunk/sound/pci/echoaudio/echoaudio.c
+++ b/trunk/sound/pci/echoaudio/echoaudio.c
@@ -2184,10 +2184,9 @@ static int __devinit snd_echo_probe(struct pci_dev *pci,
 			goto ctl_error;
 #endif
 
-	if ((err = snd_card_register(card)) < 0) {
-		snd_card_free(card);
+	err = snd_card_register(card);
+	if (err < 0)
 		goto ctl_error;
-	}
 	snd_printk(KERN_INFO "Card registered: %s\n", card->longname);
 
 	pci_set_drvdata(pci, chip);