iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

Browse Source 
* '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.
This commit is contained in:
Linus Torvalds 2007-03-07 19:04:21 -08:00
commit 06aa5b4aae
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/mips/arc/init.c
View File

@ -23,16 +23,16 @@ LONG *_prom_argv, *_prom_envp;
void __init prom_init(void) void __init prom_init(void)
{ {
PSYSTEM_PARAMETER_BLOCK pb = PROMBLOCK; PSYSTEM_PARAMETER_BLOCK pb = PROMBLOCK;
romvec = ROMVECTOR; romvec = ROMVECTOR;
ULONG cnt;
CHAR c;
prom_argc = fw_arg0; prom_argc = fw_arg0;
_prom_argv = (LONG *) fw_arg1; _prom_argv = (LONG *) fw_arg1;
_prom_envp = (LONG *) fw_arg2; _prom_envp = (LONG *) fw_arg2;
if (pb->magic != 0x53435241) { if (pb->magic != 0x53435241) {
printk(KERN_CRIT "Aieee, bad prom vector magic %08lx\n", pb->magic); printk(KERN_CRIT "Aieee, bad prom vector magic %08lx\n",
(unsigned long) pb->magic);
while(1) while(1)
; ;
} }

9
drivers/char/ds1286.c
View File

@ -197,6 +197,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file,
hrs = alm_tm.tm_hour; hrs = alm_tm.tm_hour;
min = alm_tm.tm_min; min = alm_tm.tm_min;
sec = alm_tm.tm_sec;
if (hrs >= 24) if (hrs >= 24)
hrs = 0xff; hrs = 0xff;
@ -204,9 +205,11 @@ static int ds1286_ioctl(struct inode *inode, struct file *file,
if (min >= 60) if (min >= 60)
min = 0xff; min = 0xff;
BIN_TO_BCD(sec); if (sec != 0)
BIN_TO_BCD(min); return -EINVAL;
BIN_TO_BCD(hrs);
min = BIN2BCD(min);
min = BIN2BCD(hrs);
spin_lock(&ds1286_lock); spin_lock(&ds1286_lock);
rtc_write(hrs, RTC_HOURS_ALARM); rtc_write(hrs, RTC_HOURS_ALARM);

2
include/asm-mips/dma.h
View File

@ -74,7 +74,7 @@
* *
*/ */
#ifndef GENERIC_ISA_DMA_SUPPORT_BROKEN #ifndef CONFIG_GENERIC_ISA_DMA_SUPPORT_BROKEN
#define MAX_DMA_CHANNELS 8 #define MAX_DMA_CHANNELS 8
#endif #endif