xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' into for-next

Browse Source 
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.
This commit is contained in:
Takashi Iwai
2014-07-15 15:27:19 +02:00
parent 03fe805a09 4da63c6fc4
commit 1618e84aa8
5 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/hda/hda_tegra.c
View File

@@ -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
*/