diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-15 12:46:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-15 12:46:35 +0100 |
| commit | 598911b42c940158caa1169092a804903bde845e (patch) | |
| tree | 15487a73d3854488ef679ee920c48fe1a90c28b3 /sound/pci/hda/patch_sigmatel.c | |
| parent | regulator: pfuze100: Improve PFUZE100 entry text (diff) | |
| parent | Linux 3.13-rc4 (diff) | |
| download | linux-598911b42c940158caa1169092a804903bde845e.tar.xz linux-598911b42c940158caa1169092a804903bde845e.zip | |
Merge tag 'v3.13-rc4' into regulator-pfuze100
Linux 3.13-rc4
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
| -rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index d2cc0041d9d3..088a5afbd1b9 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -2094,7 +2094,8 @@ static void stac92hd83xxx_fixup_hp_mic_led(struct hda_codec *codec, if (action == HDA_FIXUP_ACT_PRE_PROBE) { spec->mic_mute_led_gpio = 0x08; /* GPIO3 */ - codec->bus->avoid_link_reset = 1; + /* resetting controller clears GPIO, so we need to keep on */ + codec->bus->power_keep_link_on = 1; } } |