From ae27d67781d2f06dca399f6e61498a2abdd06996 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Apr 2012 13:00:32 +0000
Subject: [PATCH] --- yaml --- r: 333291 b: refs/heads/master c:
 9e0e4e11623e57c0f6635f5dc6972244ce511f77 h: refs/heads/master i:   333289:
 e5ebac27cc763bc198e89fe1944d1283e531ef2e   333287:
 3906f53f8818f06b45376f32a746919d6356cb22 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/arm/mach-at91/pm.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ea40f9a04983..c3e1f43b805a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac09281a026aad1fe489419bc948ba88b910e242
+refs/heads/master: 9e0e4e11623e57c0f6635f5dc6972244ce511f77
diff --git a/trunk/arch/arm/mach-at91/pm.c b/trunk/arch/arm/mach-at91/pm.c
index 2c2d86505a54..5315f05896e9 100644
--- a/trunk/arch/arm/mach-at91/pm.c
+++ b/trunk/arch/arm/mach-at91/pm.c
@@ -153,7 +153,9 @@ static int at91_pm_verify_clocks(void)
 		}
 	}
 
-#ifdef CONFIG_AT91_PROGRAMMABLE_CLOCKS
+	if (!IS_ENABLED(CONFIG_AT91_PROGRAMMABLE_CLOCKS))
+		return 1;
+
 	/* PCK0..PCK3 must be disabled, or configured to use clk32k */
 	for (i = 0; i < 4; i++) {
 		u32 css;
@@ -167,7 +169,6 @@ static int at91_pm_verify_clocks(void)
 			return 0;
 		}
 	}
-#endif
 
 	return 1;
 }