summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-05-11 08:36:29 +0200
committerTakashi Iwai <tiwai@suse.de>2010-05-11 08:36:29 +0200
commit26ebe0a28986f4845b2c5bea43ac5cc0b9f27f0a (patch)
tree58973f99d2f0286c177da07a7822db24c1fa53db /sound
parent0ebf9e3692d640917fb792a7494d05e1f5b1058f (diff)
downloadlinux-stable-26ebe0a28986f4845b2c5bea43ac5cc0b9f27f0a.tar.gz
linux-stable-26ebe0a28986f4845b2c5bea43ac5cc0b9f27f0a.tar.bz2
linux-stable-26ebe0a28986f4845b2c5bea43ac5cc0b9f27f0a.zip
ALSA: hda - Fix mute-LED GPIO pin for HP dv series
Old HP dv series seem to use the GPIO pin 0 for controlling the mute LED although the pin is a large package, where the newer models use GPIO 3 in such a case. For fixing the regression from the previous kernels, set spec->gpio_led statically for these model quirks. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_sigmatel.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 12825aa03106..eb4ea3df5d84 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4766,6 +4766,9 @@ static void set_hp_led_gpio(struct hda_codec *codec)
struct sigmatel_spec *spec = codec->spec;
unsigned int gpio;
+ if (spec->gpio_led)
+ return;
+
gpio = snd_hda_param_read(codec, codec->afg, AC_PAR_GPIO_CAP);
gpio &= AC_GPIO_IO_COUNT;
if (gpio > 3)
@@ -5683,11 +5686,13 @@ again:
* detection.
*/
spec->hp_detect = 1;
+ spec->gpio_led = 0x01;
break;
case STAC_HP_HDX:
spec->num_dmics = 1;
spec->num_dmuxes = 1;
spec->num_smuxes = 1;
+ spec->gpio_led = 0x08;
break;
}