From 584a4fb0a4c24f78849534d0b31fd6088530a5d3 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 1 Sep 2008 19:45:58 +0200
Subject: [PATCH] --- yaml --- r: 110959 b: refs/heads/master c:
 c86a456b25695974ddba9833ab8e4f853bcdd995 h: refs/heads/master i:   110957:
 9f23a32620617568ebe52ace8e0f2faa2bb0e459   110955:
 83d7dcf8a5f6cae26e2bcc3402c92565816b6e71   110951:
 43b4092526dd6f4fabc8bd01145c6bbdebd6a668   110943:
 d19b16a07e63a404bea6f43ef4385c20dea89dae v: v3

---
 [refs]                       | 2 +-
 trunk/sound/parisc/harmony.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eb069fd00d27..c2f48e197fd2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 631e8ad428c45ba7ab34df91d1db6cb7bf74d526
+refs/heads/master: c86a456b25695974ddba9833ab8e4f853bcdd995
diff --git a/trunk/sound/parisc/harmony.c b/trunk/sound/parisc/harmony.c
index 774372fe34ad..41f870f8a11d 100644
--- a/trunk/sound/parisc/harmony.c
+++ b/trunk/sound/parisc/harmony.c
@@ -869,7 +869,7 @@ snd_harmony_mixer_init(struct snd_harmony *h)
 	int idx, err;
 
 	if (snd_BUG_ON(!h))
-		reutrn -EINVAL;
+		return -EINVAL;
 	strcpy(card->mixername, "Harmony Gain control interface");
 
 	for (idx = 0; idx < HARMONY_CONTROLS; idx++) {