diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-07-15 17:27:19 +0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-07-15 17:28:43 +0400 |
| commit | 1618e84aa87af94b46921b265b68bb7994571c20 (patch) | |
| tree | 0ee428edbcd6e1a49abe72767850997e6adfec1c /sound/pci/hda/hda_tegra.c | |
| parent | 03fe805a098422d27cbbbad29a54ff1349da3622 (diff) | |
| parent | 4da63c6fc426023d1a20e45508c47d7d68c6a53d (diff) | |
| download | linux-1618e84aa87af94b46921b265b68bb7994571c20.tar.xz | |
Merge branch 'for-linus' into for-next
Since init_failed flag was moved to struct hda_intel, its access in
the commit [4da63c6f: ALSA: hda - Fix broken PM due to incomplete
i915 initialization] is also replaced with hda->init_failed
appropriately.
Diffstat (limited to 'sound/pci/hda/hda_tegra.c')
| -rw-r--r-- | sound/pci/hda/hda_tegra.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c index dc4bb21ed17b..227990bc02e3 100644 --- a/sound/pci/hda/hda_tegra.c +++ b/sound/pci/hda/hda_tegra.c @@ -235,6 +235,7 @@ disable_hda: return rc; } +#ifdef CONFIG_PM_SLEEP static void hda_tegra_disable_clocks(struct hda_tegra *data) { clk_disable_unprepare(data->hda2hdmi_clk); @@ -242,7 +243,6 @@ static void hda_tegra_disable_clocks(struct hda_tegra *data) clk_disable_unprepare(data->hda_clk); } -#ifdef CONFIG_PM_SLEEP /* * power management */ |