p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ARM: imx6: do not call imx6q_suspend_init() with !CONFIG_SUSPEND 

When CONFIG_SUSPEND is not enabled, we should reasonably skip the call
to imx6q_suspend_init().

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
This commit is contained in:
Shawn Guo 2014-02-26 21:40:32 +08:00
parent afc51f4643
commit 110666dc65
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-imx/pm-imx6q.c
View File

@ -516,10 +516,12 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata
WARN_ON(!ccm_base); WARN_ON(!ccm_base);
ret = imx6q_suspend_init(socdata); if (IS_ENABLED(CONFIG_SUSPEND)) {
if (ret) ret = imx6q_suspend_init(socdata);
pr_warn("%s: No DDR LPM support with suspend %d!\n", if (ret)
__func__, ret); pr_warn("%s: No DDR LPM support with suspend %d!\n",
__func__, ret);
}
/* /*
* This is for SW workaround step #1 of ERR007265, see comments * This is for SW workaround step #1 of ERR007265, see comments