From 49661a870c928f0d0fa918a1ead22428d34717ec Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Tue, 14 Aug 2012 03:03:35 -0300
Subject: [PATCH] --- yaml --- r: 330883 b: refs/heads/master c:
 0590c7130dfb88ddc7bbecd343efae1d3623f209 h: refs/heads/master i:   330881:
 e6feef10305f7a727915983b690ec9314e598b11   330879:
 82039017d11536bc2675307f46a71aad84308d04 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/media/usb/stk1160/stk1160-ac97.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8f35eec41ae0..34a6c7905c52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f367cc1efebdfacfca083e55fdeafa0163054995
+refs/heads/master: 0590c7130dfb88ddc7bbecd343efae1d3623f209
diff --git a/trunk/drivers/media/usb/stk1160/stk1160-ac97.c b/trunk/drivers/media/usb/stk1160/stk1160-ac97.c
index 8d325f50c87b..c8583c262c3d 100644
--- a/trunk/drivers/media/usb/stk1160/stk1160-ac97.c
+++ b/trunk/drivers/media/usb/stk1160/stk1160-ac97.c
@@ -133,8 +133,7 @@ int stk1160_ac97_register(struct stk1160 *dev)
 
 err:
 	dev->snd_card = NULL;
-	if (card)
-		snd_card_free(card);
+	snd_card_free(card);
 	return rc;
 }