aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/rtas-rtc.c
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2006-03-20 10:53:56 -0600
committerKumar Gala <galak@kernel.crashing.org>2006-03-20 10:53:56 -0600
commit61c5504a0ed66c8b460f9a006eedaea2ee587e33 (patch)
tree2cf21d235f17e80d47fdb4ee1248865be8196d4d /arch/powerpc/kernel/rtas-rtc.c
parent9585da3729e7e27bf22818625c10ac6c64ebb609 (diff)
parent2c276603c3e5ebf38155a9d1fbbda656d52d138e (diff)
downloadkernel_samsung_smdk4412-61c5504a0ed66c8b460f9a006eedaea2ee587e33.tar.gz
kernel_samsung_smdk4412-61c5504a0ed66c8b460f9a006eedaea2ee587e33.tar.bz2
kernel_samsung_smdk4412-61c5504a0ed66c8b460f9a006eedaea2ee587e33.zip
Merge branch 'master'
Diffstat (limited to 'arch/powerpc/kernel/rtas-rtc.c')
-rw-r--r--arch/powerpc/kernel/rtas-rtc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/rtas-rtc.c b/arch/powerpc/kernel/rtas-rtc.c
index 635d3b9a881..34d073fb609 100644
--- a/arch/powerpc/kernel/rtas-rtc.c
+++ b/arch/powerpc/kernel/rtas-rtc.c
@@ -52,7 +52,7 @@ void rtas_get_rtc_time(struct rtc_time *rtc_tm)
error = rtas_call(rtas_token("get-time-of-day"), 0, 8, ret);
if (error == RTAS_CLOCK_BUSY || rtas_is_extended_busy(error)) {
if (in_interrupt() && printk_ratelimit()) {
- memset(&rtc_tm, 0, sizeof(struct rtc_time));
+ memset(rtc_tm, 0, sizeof(struct rtc_time));
printk(KERN_WARNING "error: reading clock"
" would delay interrupt\n");
return; /* delay not allowed */