diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-07 22:04:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-07 22:04:21 -0500 |
| commit | 06aa5b4aae223ea4d623dc68e85466174bb92c84 (patch) | |
| tree | 22b40cd55396e5329fe8cf69907a1af13145f8bd /drivers | |
| parent | c91a32503d9ff8079cc45fa743d428fd705042dd (diff) | |
| parent | b2e569d876e153365b01525a102b7d90bb309446 (diff) | |
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.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/ds1286.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/char/ds1286.c b/drivers/char/ds1286.c index 6d58b0370802..59146e3365ba 100644 --- a/drivers/char/ds1286.c +++ b/drivers/char/ds1286.c | |||
| @@ -197,6 +197,7 @@ static int ds1286_ioctl(struct inode *inode, struct file *file, | |||
| 197 | 197 | ||
| 198 | hrs = alm_tm.tm_hour; | 198 | hrs = alm_tm.tm_hour; |
| 199 | min = alm_tm.tm_min; | 199 | min = alm_tm.tm_min; |
| 200 | sec = alm_tm.tm_sec; | ||
| 200 | 201 | ||
| 201 | if (hrs >= 24) | 202 | if (hrs >= 24) |
| 202 | hrs = 0xff; | 203 | hrs = 0xff; |
| @@ -204,9 +205,11 @@ static int ds1286_ioctl(struct inode *inode, struct file *file, | |||
| 204 | if (min >= 60) | 205 | if (min >= 60) |
| 205 | min = 0xff; | 206 | min = 0xff; |
| 206 | 207 | ||
| 207 | BIN_TO_BCD(sec); | 208 | if (sec != 0) |
| 208 | BIN_TO_BCD(min); | 209 | return -EINVAL; |
| 209 | BIN_TO_BCD(hrs); | 210 | |
| 211 | min = BIN2BCD(min); | ||
| 212 | min = BIN2BCD(hrs); | ||
| 210 | 213 | ||
| 211 | spin_lock(&ds1286_lock); | 214 | spin_lock(&ds1286_lock); |
| 212 | rtc_write(hrs, RTC_HOURS_ALARM); | 215 | rtc_write(hrs, RTC_HOURS_ALARM); |