From 2cd1ed59be8e90c64b51c5c321d72866d6cc9905 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@sunset.davemloft.net>
Date: Sat, 27 Oct 2007 22:33:33 -0700
Subject: [PATCH] --- yaml --- r: 72963 b: refs/heads/master c:
 23e8bc200c3bbbd6eae1128e9095a3968954af2e h: refs/heads/master i:   72961:
 5c99e05645129a7b756fbe12861c58ddfbc4526d   72959:
 c7a4b3ce34229034a7051c5c6044bc9228dfde80 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/sparc64/kernel/time.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 97a86d263c85..9de346e06f08 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b1d08ac064268d0ae2281e98bf5e82627e0f0c56
+refs/heads/master: 23e8bc200c3bbbd6eae1128e9095a3968954af2e
diff --git a/trunk/arch/sparc64/kernel/time.c b/trunk/arch/sparc64/kernel/time.c
index cd8c740cba1d..a2cf955294c1 100644
--- a/trunk/arch/sparc64/kernel/time.c
+++ b/trunk/arch/sparc64/kernel/time.c
@@ -1070,7 +1070,7 @@ static int set_rtc_mmss(unsigned long nowtime)
 	 * Not having a register set can lead to trouble.
 	 * Also starfire doesn't have a tod clock.
 	 */
-	if (!mregs && !dregs & !bregs)
+	if (!mregs && !dregs && !bregs)
 		return -1;
 
 	if (mregs) {