From 110666dc655a142bc693ffa61de8eef82c0a8a98 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Wed, 26 Feb 2014 21:40:32 +0800 Subject: [PATCH] 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 --- arch/arm/mach-imx/pm-imx6q.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-imx/pm-imx6q.c b/arch/arm/mach-imx/pm-imx6q.c index 2473ad4db819..16f0d249f6a7 100644 --- a/arch/arm/mach-imx/pm-imx6q.c +++ b/arch/arm/mach-imx/pm-imx6q.c @@ -516,10 +516,12 @@ static void __init imx6_pm_common_init(const struct imx6_pm_socdata WARN_ON(!ccm_base); - ret = imx6q_suspend_init(socdata); - if (ret) - pr_warn("%s: No DDR LPM support with suspend %d!\n", - __func__, ret); + if (IS_ENABLED(CONFIG_SUSPEND)) { + ret = imx6q_suspend_init(socdata); + if (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 -- 2.34.1