From: Clemens Ladisch <clemens@ladisch.de>
Date: Mon, 21 Jan 2008 07:52:11 +0000 (+0100)
Subject: [ALSA] oxygen: fix control filter
X-Git-Tag: v2.6.25-rc1~1127^2~67
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9d88a8bd9fb85d2a4a0adb89c47dcae437fa308;p=linux-2.6

[ALSA] oxygen: fix control filter

Actually use the template that was maybe changed by the control filter
instead of the original one.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/sound/pci/oxygen/oxygen_mixer.c b/sound/pci/oxygen/oxygen_mixer.c
index 11114cedc0..0993c29e62 100644
--- a/sound/pci/oxygen/oxygen_mixer.c
+++ b/sound/pci/oxygen/oxygen_mixer.c
@@ -667,7 +667,7 @@ static int add_controls(struct oxygen *chip,
 		err = chip->model->control_filter(&template);
 		if (err < 0)
 			return err;
-		ctl = snd_ctl_new1(&controls[i], chip);
+		ctl = snd_ctl_new1(&template, chip);
 		if (!ctl)
 			return -ENOMEM;
 		err = snd_ctl_add(chip->card, ctl);