Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3616aa19 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-fixes-for-v4.12' of... 

Merge tag 'davinci-fixes-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

These fix issues with power management initialization code
on DaVinci. Some resources were getting freed prematurely.
And there was an issue with resources not being on error.

* tag 'davinci-fixes-for-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: PM: Do not free useful resources in normal path in 'davinci_pm_init'
  ARM: davinci: PM: Free resources in error handling path in 'davinci_pm_init'

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6bf1c2d2 95d7c1f1

arch/arm/mach-davinci/pm.c

+6 −1
Original line number Diff line number Diff line
@@ -153,7 +153,8 @@ int __init davinci_pm_init(void) 
	davinci_sram_suspend = sram_alloc(davinci_cpu_suspend_sz, NULL);

	if (!davinci_sram_suspend) {

		pr_err("PM: cannot allocate SRAM memory\n");

		return -ENOMEM;

		ret = -ENOMEM;

		goto no_sram_mem;

	}



	davinci_sram_push(davinci_sram_suspend, davinci_cpu_suspend,
@@ -161,6 +162,10 @@ int __init davinci_pm_init(void) 


	suspend_set_ops(&davinci_pm_ops);



	return 0;



no_sram_mem:

	iounmap(pm_config.ddrpsc_reg_base);

no_ddrpsc_mem:

	iounmap(pm_config.ddrpll_reg_base);

no_ddrpll_mem: