Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
tjh.dev
kernel
os
linux
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] ARC: Fix several compiler warnings.
[MIPS] ISA: Fix typo
[CHAR] ds1286: Fix handling of seconds in RTC_ALM_SET ioctl.
+3
-3
arch/mips/arc/init.c
+3
-3
arch/mips/arc/init.c
···
23
23
void __init prom_init(void)
24
24
{
25
25
PSYSTEM_PARAMETER_BLOCK pb = PROMBLOCK;
26
+
26
27
romvec = ROMVECTOR;
27
-
ULONG cnt;
28
-
CHAR c;
29
28
30
29
prom_argc = fw_arg0;
31
30
_prom_argv = (LONG *) fw_arg1;
32
31
_prom_envp = (LONG *) fw_arg2;
33
32
34
33
if (pb->magic != 0x53435241) {
35
-
printk(KERN_CRIT "Aieee, bad prom vector magic %08lx\n", pb->magic);
34
+
printk(KERN_CRIT "Aieee, bad prom vector magic %08lx\n",
35
+
(unsigned long) pb->magic);
36
36
while(1)
37
37
;
38
38
}
+6
-3
drivers/char/ds1286.c
+6
-3
drivers/char/ds1286.c
···
197
197
198
198
hrs = alm_tm.tm_hour;
199
199
min = alm_tm.tm_min;
200
+
sec = alm_tm.tm_sec;
200
201
201
202
if (hrs >= 24)
202
203
hrs = 0xff;
···
205
204
if (min >= 60)
206
205
min = 0xff;
207
206
208
-
BIN_TO_BCD(sec);
209
-
BIN_TO_BCD(min);
210
-
BIN_TO_BCD(hrs);
207
+
if (sec != 0)
208
+
return -EINVAL;
209
+
210
+
min = BIN2BCD(min);
211
+
min = BIN2BCD(hrs);
211
212
212
213
spin_lock(&ds1286_lock);
213
214
rtc_write(hrs, RTC_HOURS_ALARM);