From 690af0429bf14511457b52381aad989177b2dc62 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Tue, 28 Jul 2009 18:25:29 +0200 Subject: [PATCH] --- yaml --- r: 157811 b: refs/heads/master c: 50c62f068ee67b5a0178855f502f4ea2ee931eed h: refs/heads/master i: 157809: f34ea701a791145e0996d17cee434edea0fd0504 157807: 170ce2c589dce3fae565883ef6fb25be4ad9e059 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_sigmatel.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d591a2a27db6..e5b587d179b4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6479c63188290beae83ade3243b9d6eb47d394b6 +refs/heads/master: 50c62f068ee67b5a0178855f502f4ea2ee931eed diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c index be6cf2cfb192..66b1f3cfc871 100644 --- a/trunk/sound/pci/hda/patch_sigmatel.c +++ b/trunk/sound/pci/hda/patch_sigmatel.c @@ -5376,7 +5376,8 @@ static int patch_stac92hd71bxx(struct hda_codec *codec) /* no output amps */ spec->num_pwrs = 0; - spec->mixer = stac92hd71bxx_analog_mixer; + if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1) + spec->mixer = stac92hd71bxx_analog_mixer; /* disable VSW */ spec->init = &stac92hd71bxx_analog_core_init[HD_DISABLE_PORTF]; @@ -5403,7 +5404,8 @@ static int patch_stac92hd71bxx(struct hda_codec *codec) default: memcpy(&spec->private_dimux, &stac92hd71bxx_dmux_amixer, sizeof(stac92hd71bxx_dmux_amixer)); - spec->mixer = stac92hd71bxx_analog_mixer; + if (snd_hda_get_bool_hint(codec, "analog_mixer") == 1) + spec->mixer = stac92hd71bxx_analog_mixer; spec->init = stac92hd71bxx_analog_core_init; codec->slave_dig_outs = stac92hd71bxx_slave_dig_outs; spec->num_dmics = stac92hd71bxx_connected_ports(codec,