Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'm68k-for-v4.19-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fix from Geert Uytterhoeven:
"Just a single fix for a bug introduced during the merge window: fix
wrong date and time on PMU-based Macs"
* tag 'm68k-for-v4.19-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k/mac: Use correct PMU response format
+4
-6
+4
-6
arch/m68k/mac/misc.c
+4
-6
arch/m68k/mac/misc.c
···
98
98
99
99
if (pmu_request(&req, NULL, 1, PMU_READ_RTC) < 0)
100
100
return 0;
101
-
while (!req.complete)
102
-
pmu_poll();
101
+
pmu_wait_complete(&req);
103
102
104
-
time = (u32)((req.reply[1] << 24) | (req.reply[2] << 16) |
105
-
(req.reply[3] << 8) | req.reply[4]);
103
+
time = (u32)((req.reply[0] << 24) | (req.reply[1] << 16) |
104
+
(req.reply[2] << 8) | req.reply[3]);
106
105
107
106
return time - RTC_OFFSET;
108
107
}
···
115
116
(data >> 24) & 0xFF, (data >> 16) & 0xFF,
116
117
(data >> 8) & 0xFF, data & 0xFF) < 0)
117
118
return;
118
-
while (!req.complete)
119
-
pmu_poll();
119
+
pmu_wait_complete(&req);
120
120
}
121
121
122
122
static __u8 pmu_read_pram(int offset)