summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-01-13 14:36:37 +0100
committerTakashi Iwai <tiwai@suse.de>2011-01-13 14:37:14 +0100
commit6fc398cb306b0441436c93d6ddead3109b99f884 (patch)
treea25efc1ee69bc7c7821a498677411a305f6f0929 /sound/pci
parent74dc8909c1ce38098e6689239ed6ae6b6bf9f92b (diff)
downloadop-kernel-dev-6fc398cb306b0441436c93d6ddead3109b99f884.zip
op-kernel-dev-6fc398cb306b0441436c93d6ddead3109b99f884.tar.gz
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>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_realtek.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 738d5d8..f13920e 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) |
OpenPOWER on IntegriCloud