diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-09-05 08:05:11 -0400 |
| commit | 75d8f2931a803b803cb4a850448460475c20f30b (patch) | |
| tree | 9853b9084fa55609c8e4abbc1763bc500e05da50 /sound/pci/hda/patch_via.c | |
| parent | ffb690d5aa36d38d7bed7579e3f07b84ff6b3a08 (diff) | |
| parent | e93c7d1bc350189511d32cec2f0af79c30e7fa47 (diff) | |
Merge branch 'asoc-omap' into for-3.7
Diffstat (limited to 'sound/pci/hda/patch_via.c')
| -rw-r--r-- | sound/pci/hda/patch_via.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 80d90cb42853..430771776915 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c | |||
| @@ -1752,6 +1752,14 @@ static int via_suspend(struct hda_codec *codec) | |||
| 1752 | { | 1752 | { |
| 1753 | struct via_spec *spec = codec->spec; | 1753 | struct via_spec *spec = codec->spec; |
| 1754 | vt1708_stop_hp_work(spec); | 1754 | vt1708_stop_hp_work(spec); |
| 1755 | |||
| 1756 | if (spec->codec_type == VT1802) { | ||
| 1757 | /* Fix pop noise on headphones */ | ||
| 1758 | int i; | ||
| 1759 | for (i = 0; i < spec->autocfg.hp_outs; i++) | ||
| 1760 | snd_hda_set_pin_ctl(codec, spec->autocfg.hp_pins[i], 0); | ||
| 1761 | } | ||
| 1762 | |||
| 1755 | return 0; | 1763 | return 0; |
| 1756 | } | 1764 | } |
| 1757 | #endif | 1765 | #endif |