diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-27 11:00:00 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-27 11:00:00 +0200 |
| commit | 258fc497fa8e8d4cf54c5ffcd196e26325d5202d (patch) | |
| tree | 16da56294f35dd093179a797c741ae2346b9f2e9 /arch | |
| parent | Linux 4.6-rc5 (diff) | |
| parent | ARM: EXYNOS: Properly skip unitialized parent clock in power domain on (diff) | |
| download | linux-258fc497fa8e8d4cf54c5ffcd196e26325d5202d.tar.xz linux-258fc497fa8e8d4cf54c5ffcd196e26325d5202d.zip | |
Merge tag 'samsung-fixes-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into fixes
Fix for more theoretical than practical OOPS on first turn on of a exynos
power domain, if there was no turn off before. Usually all power domains
are on, so the first action is to turn off but some older bootloaders
might behave differently.
* tag 'samsung-fixes-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: EXYNOS: Properly skip unitialized parent clock in power domain on
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-exynos/pm_domains.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c index 7c21760f590f..875a2bab64f6 100644 --- a/arch/arm/mach-exynos/pm_domains.c +++ b/arch/arm/mach-exynos/pm_domains.c @@ -92,7 +92,7 @@ static int exynos_pd_power(struct generic_pm_domain *domain, bool power_on) if (IS_ERR(pd->clk[i])) break; - if (IS_ERR(pd->clk[i])) + if (IS_ERR(pd->pclk[i])) continue; /* Skip on first power up */ if (clk_set_parent(pd->clk[i], pd->pclk[i])) pr_err("%s: error setting parent to clock%d\n", |