From 391a1e6192a3e45aea0afe5ae4ec66de18b566bf Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 30 Apr 2012 16:53:11 +0000
Subject: [PATCH] --- yaml --- r: 333286 b: refs/heads/master c:
 5f0cc6d16c0572bf5e9e65b6133ac415268c0720 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mach-pxa/viper.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c7d53f29074e..0e93a3da9c51 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c7f4f5ce6523af6b6e103a991b2ca71b962acb7
+refs/heads/master: 5f0cc6d16c0572bf5e9e65b6133ac415268c0720
diff --git a/trunk/arch/arm/mach-pxa/viper.c b/trunk/arch/arm/mach-pxa/viper.c
index 130379fb9d0f..ac733e91f3e4 100644
--- a/trunk/arch/arm/mach-pxa/viper.c
+++ b/trunk/arch/arm/mach-pxa/viper.c
@@ -768,8 +768,7 @@ static unsigned long viper_tpm;
 
 static int __init viper_tpm_setup(char *str)
 {
-	strict_strtoul(str, 10, &viper_tpm);
-	return 1;
+	return strict_strtoul(str, 10, &viper_tpm) >= 0;
 }
 
 __setup("tpm=", viper_tpm_setup);