patch-2.2.15 linux/arch/ppc/kernel/pmac_time.c

• Lines: 25
• Date: Fri Apr 21 12:45:47 2000
• Orig file: v2.2.14/arch/ppc/kernel/pmac_time.c
• Orig date: Sat Aug 28 20:00:53 1999

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/arch/ppc/kernel/pmac_time.c linux/arch/ppc/kernel/pmac_time.c
@@ -56,7 +56,11 @@
 	struct adb_request req;
 
 	/* Get the time from the RTC */
-	switch (adb_hardware) {
+	if (adb_controller == 0)
+		return 0;
+	/* adb_controller->kind, not adb_hardware, since that doesn't
+	   get set until we call adb_init - paulus. */
+	switch (adb_controller->kind) {
 	case ADB_VIACUDA:
 		if (cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_GET_TIME) < 0)
 			return 0;
@@ -68,8 +72,10 @@
 		return (req.reply[3] << 24) + (req.reply[4] << 16)
 			+ (req.reply[5] << 8) + req.reply[6] - RTC_OFFSET;
 	case ADB_VIAPMU:
-		if (pmu_request(&req, NULL, 1, PMU_READ_RTC) < 0)
+		if (pmu_request(&req, NULL, 1, PMU_READ_RTC) < 0) {
+			printk("pmac_read_rtc_time: pmu_request failed\n");
 			return 0;
+		}
 		while (!req.complete)
 			pmu_poll();
 		if (req.reply_len != 5)