From f78a4daf14f86dd3d10383e71fc6a2427552ec48 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 27 Feb 2009 22:41:54 -0800
Subject: [PATCH] --- yaml --- r: 141770 b: refs/heads/master c:
 dfc70567d76b9d506855fd5b334a4dd0ebdf1aa7 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index eb874bac6120..fef408f7882b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0fdef36aca8a2900d3a5c113f6973d84cf38d7b7
+refs/heads/master: dfc70567d76b9d506855fd5b334a4dd0ebdf1aa7
diff --git a/trunk/drivers/staging/line6/audio.c b/trunk/drivers/staging/line6/audio.c
index 37f759a76158..3aa946899ced 100644
--- a/trunk/drivers/staging/line6/audio.c
+++ b/trunk/drivers/staging/line6/audio.c
@@ -25,12 +25,12 @@ static char *line6_id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
 */
 int line6_init_audio(struct usb_line6 *line6)
 {
-	static int dev = 0;
+	static int dev;
 	struct snd_card *card;
 
 	card = snd_card_new(line6_index[dev], line6_id[dev], THIS_MODULE, 0);
 
-	if(card == NULL)
+	if (card == NULL)
 		return -ENOMEM;
 
 	line6->card = card;
@@ -49,7 +49,8 @@ int line6_register_audio(struct usb_line6 *line6)
 {
 	int err;
 
-	if((err = snd_card_register(line6->card)) < 0)
+	err = snd_card_register(line6->card);
+	if (err < 0)
 		return err;
 
 	return 0;