diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2014-02-26 08:40:32 -0500 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2014-03-04 21:40:53 -0500 |
commit | 110666dc655a142bc693ffa61de8eef82c0a8a98 (patch) | |
tree | 5344ca52089214f71b3bed6c83abacc4e24a7892 /arch/arm/mach-imx/pm-imx6q.c | |
parent | afc51f4643063c4285f713a27bb39077b1ef1ed3 (diff) |
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>
Diffstat (limited to 'arch/arm/mach-imx/pm-imx6q.c')
-rw-r--r-- | arch/arm/mach-imx/pm-imx6q.c | 10 |
1 files 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 | |||
516 | 516 | ||
517 | WARN_ON(!ccm_base); | 517 | WARN_ON(!ccm_base); |
518 | 518 | ||
519 | ret = imx6q_suspend_init(socdata); | 519 | if (IS_ENABLED(CONFIG_SUSPEND)) { |
520 | if (ret) | 520 | ret = imx6q_suspend_init(socdata); |
521 | pr_warn("%s: No DDR LPM support with suspend %d!\n", | 521 | if (ret) |
522 | __func__, ret); | 522 | pr_warn("%s: No DDR LPM support with suspend %d!\n", |
523 | __func__, ret); | ||
524 | } | ||
523 | 525 | ||
524 | /* | 526 | /* |
525 | * This is for SW workaround step #1 of ERR007265, see comments | 527 | * This is for SW workaround step #1 of ERR007265, see comments |