]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[SPARC64]: Fix bogus '&' conditinal in set_rtc_mmss().
authorDavid S. Miller <davem@sunset.davemloft.net>
Sun, 28 Oct 2007 05:33:33 +0000 (22:33 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 31 Oct 2007 22:30:49 +0000 (15:30 -0700)
We're using '&' instead of '&&'.

Noticed by Roel Kluin.

Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc64/kernel/time.c

index cd8c740cba1da72fccf69c78736b662383e8539b..a2cf955294c1ae89f23a4a31c93a629e735622cb 100644 (file)
@@ -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) {