From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 13 Jan 2011 13:36:37 +0000 (+0100)
Subject: ALSA: hda - Apply mario fixup only once
X-Git-Tag: v2.6.38-rc1~7^2~1^2~11
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=6fc398cb306b0441436c93d6ddead3109b99f884;p=~emulex%2Finfiniband.git

ALSA: hda - Apply mario fixup only once

The amp-override is necessary only once at initialization time.
Also fixed a coding style issue.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 738d5d8962d..f13920e5384 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -19366,7 +19366,10 @@ static void alc662_auto_init(struct hda_codec *codec)
 }
 
 static void alc272_fixup_mario(struct hda_codec *codec,
-			       const struct alc_fixup *fix, int pre_init) {
+			       const struct alc_fixup *fix, int pre_init)
+{
+	if (!pre_init)
+		return;
 	if (snd_hda_override_amp_caps(codec, 0x2, HDA_OUTPUT,
 				      (0x3b << AC_AMPCAP_OFFSET_SHIFT) |
 				      (0x3b << AC_AMPCAP_NUM_STEPS_SHIFT) |