From d643e2d2cc1d1f37751a99a7c4cb30064cc68aac Mon Sep 17 00:00:00 2001 From: Finn Thain Date: Wed, 2 Jun 2010 15:58:24 +0200 Subject: m68k/mac: Fix RTC on PMU machines Copy RTC response bytes correctly on powerbooks and duos. Thanks to Diego Cousinet who debugged this and provided me with the fix. Tested on PowerBook 190 and Duo 280c. Signed-off-by: Finn Thain Reported-by: Diego Cousinet Signed-off-by: Geert Uytterhoeven --- arch/m68k/mac/misc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'arch') diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c index 0f118ca156d9..e023fc6b37e5 100644 --- a/arch/m68k/mac/misc.c +++ b/arch/m68k/mac/misc.c @@ -91,7 +91,7 @@ static void cuda_write_pram(int offset, __u8 data) #define cuda_write_pram NULL #endif -#if 0 /* def CONFIG_ADB_PMU68K */ +#ifdef CONFIG_ADB_PMU68K static long pmu_read_time(void) { struct adb_request req; @@ -102,8 +102,8 @@ static long pmu_read_time(void) while (!req.complete) pmu_poll(); - time = (req.reply[0] << 24) | (req.reply[1] << 16) - | (req.reply[2] << 8) | req.reply[3]; + time = (req.reply[1] << 24) | (req.reply[2] << 16) + | (req.reply[3] << 8) | req.reply[4]; return time - RTC_OFFSET; } -- cgit v1.2.3