From 23e8bc200c3bbbd6eae1128e9095a3968954af2e Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Sat, 27 Oct 2007 22:33:33 -0700 Subject: [PATCH] [SPARC64]: Fix bogus '&' conditinal in set_rtc_mmss(). We're using '&' instead of '&&'. Noticed by Roel Kluin. Signed-off-by: David S. Miller --- arch/sparc64/kernel/time.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index cd8c740..a2cf955 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) { -- 2.7.4