renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-18 10:34:24 +08:00
Code

[CHAR] ds1286: Fix handling of seconds in RTC_ALM_SET ioctl.

Browse Source 
o Fix use of uninitialized variable sec.
 o Make the RTC_ALM_SET ioctl return -EINVAL for non-zero seconds - the
   DS1286 has no second field for the alarm time.
 o Replace the obscure BIN_TO_BCD macro with BIN2BCD.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle 2007-03-08 00:14:25 +00:00
parent 455921451a
commit b35692ebde
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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);