From: David S. Miller <davem@sunset.davemloft.net>
Date: Sun, 28 Oct 2007 05:33:33 +0000 (-0700)
Subject: [SPARC64]: Fix bogus '&' conditinal in set_rtc_mmss().
X-Git-Tag: v2.6.24-rc2~62
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=23e8bc200c3bbbd6eae1128e9095a3968954af2e;p=linux-2.6-omap-h63xx.git

[SPARC64]: Fix bogus '&' conditinal in set_rtc_mmss().

We're using '&' instead of '&&'.

Noticed by Roel Kluin.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index cd8c740cba1..a2cf955294c 100644
--- a/arch/sparc64/kernel/time.c
+++ b/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) {