diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-12 18:18:08 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-12 18:18:08 +0100 |
| commit | 84a3bd061c1974aea4b14b954e518ce144e407c6 (patch) | |
| tree | 1dade22a9448d6aa0f7fd2a4d052374132b9567b /sound/pci/hda/hda_intel.c | |
| parent | f52d7a4393136107f526040f6ef190ab49032496 (diff) | |
| parent | 52dc438606d1ef78b96f56cc04dbea9242005730 (diff) | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/hda_intel.c')
| -rw-r--r-- | sound/pci/hda/hda_intel.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index efcc4f7c57f..e54420e691a 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c @@ -2082,7 +2082,8 @@ static void azx_power_notify(struct hda_bus *bus) } if (power_on) azx_init_chip(chip); - else if (chip->running && power_save_controller) + else if (chip->running && power_save_controller && + !bus->power_keep_link_on) azx_stop_chip(chip); } #endif /* CONFIG_SND_HDA_POWER_SAVE */ |