diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-16 06:48:08 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-07-16 06:48:08 -1000 |
| commit | 2da2944740931f2b3ef49fd88824959951f5693e (patch) | |
| tree | 1b7053cdd2c9f2c66125ab47ebea66ebe60ef5f8 /sound/pci/hda/hda_tegra.c | |
| parent | c20ddc649990ecbe6813afb6e605415e2d083d68 (diff) | |
| parent | 4da63c6fc426023d1a20e45508c47d7d68c6a53d (diff) | |
| download | linux-stable-2da2944740931f2b3ef49fd88824959951f5693e.tar.gz linux-stable-2da2944740931f2b3ef49fd88824959951f5693e.tar.bz2 linux-stable-2da2944740931f2b3ef49fd88824959951f5693e.zip | |
Merge tag 'sound-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Things seem to calm down so far, just a small few HD-audio fixes
(regression fixes and a new codec ID addition) popping up"
* tag 'sound-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Fix broken PM due to incomplete i915 initialization
ALSA: hda - Revert stream assignment order for Intel controllers
ALSA: hda - Add new GPU codec ID 0x10de0070 to snd-hda
ALSA: hda: Fix build warning
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 a366ba9293a8..358414da6418 100644 --- a/sound/pci/hda/hda_tegra.c +++ b/sound/pci/hda/hda_tegra.c @@ -236,6 +236,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); @@ -243,7 +244,6 @@ static void hda_tegra_disable_clocks(struct hda_tegra *data) clk_disable_unprepare(data->hda_clk); } -#ifdef CONFIG_PM_SLEEP /* * power management */ |