diff options
| author | David S. Miller <davem@sunset.davemloft.net> | 2007-10-28 01:33:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-31 18:30:49 -0400 |
| commit | 23e8bc200c3bbbd6eae1128e9095a3968954af2e (patch) | |
| tree | ce1116af3b3131118884048cfd2b01224627accf /arch | |
| parent | b1d08ac064268d0ae2281e98bf5e82627e0f0c56 (diff) | |
[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>
Diffstat (limited to 'arch')
| -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) | |||
| 1070 | * Not having a register set can lead to trouble. | 1070 | * Not having a register set can lead to trouble. |
| 1071 | * Also starfire doesn't have a tod clock. | 1071 | * Also starfire doesn't have a tod clock. |
| 1072 | */ | 1072 | */ |
| 1073 | if (!mregs && !dregs & !bregs) | 1073 | if (!mregs && !dregs && !bregs) |
| 1074 | return -1; | 1074 | return -1; |
| 1075 | 1075 | ||
| 1076 | if (mregs) { | 1076 | if (mregs) { |