diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-10-28 06:33:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-31 23:30:49 +0100 |
| commit | 23e8bc200c3bbbd6eae1128e9095a3968954af2e (patch) | |
| tree | ce1116af3b3131118884048cfd2b01224627accf | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6 (diff) | |
| download | linux-23e8bc200c3bbbd6eae1128e9095a3968954af2e.tar.xz linux-23e8bc200c3bbbd6eae1128e9095a3968954af2e.zip | |
[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>
| -rw-r--r-- | arch/sparc64/kernel/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c index cd8c740cba1d..a2cf955294c1 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) { |