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 <[email protected]>
Reported-by: Diego Cousinet <[email protected]>

Index: linux-2.6.34/arch/m68k/mac/misc.c
===================================================================
--- linux-2.6.34.orig/arch/m68k/mac/misc.c      2010-05-28 18:06:41.000000000 
+1000
+++ linux-2.6.34/arch/m68k/mac/misc.c   2010-05-28 18:06:41.000000000 +1000
@@ -91,7 +91,7 @@ static void cuda_write_pram(int offset, 
 #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;
 }
 
--
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to