diff options
author | Takashi Iwai <tiwai@suse.de> | 2015-05-29 10:27:50 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2015-05-29 10:27:50 +0200 |
commit | 984a8547052711867332eeaec4141755fc040553 (patch) | |
tree | c8bbc1e16d11c023e1a7ec0421401be0a0e4a304 /sound/pci/hda/patch_sigmatel.c | |
parent | 3270f0dd1a35d6b785bf39e1ed7ed6e1e43c8ebb (diff) | |
parent | b47eee2e0a7de623c24dbcaf303c3bf2b5155455 (diff) | |
download | op-kernel-dev-984a8547052711867332eeaec4141755fc040553.zip op-kernel-dev-984a8547052711867332eeaec4141755fc040553.tar.gz |
Merge branch 'for-linus' into for-next
Merge back the latest HD-audio stuff for further development.
Diffstat (limited to 'sound/pci/hda/patch_sigmatel.c')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 054026a..6ff92ab 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c @@ -4403,7 +4403,6 @@ static const struct hda_codec_ops stac_patch_ops = { #ifdef CONFIG_PM .suspend = stac_suspend, #endif - .stream_pm = snd_hda_gen_stream_pm, .reboot_notify = stac_shutup, }; @@ -4697,7 +4696,8 @@ static int patch_stac92hd71bxx(struct hda_codec *codec) return err; spec = codec->spec; - codec->power_save_node = 1; + /* disabled power_save_node since it causes noises on a Dell machine */ + /* codec->power_save_node = 1; */ spec->linear_tone_beep = 0; spec->gen.own_eapd_ctl = 1; spec->gen.power_down_unused = 1; |