diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2007-05-01 00:24:54 -0400 |
| commit | bc95f3669f5e6f63cf0b84fe4922c3c6dd4aa775 (patch) | |
| tree | 427fcf2a7287c16d4b5aa6cbf494d59579a6a8b1 /drivers/char/ds1286.c | |
| parent | 3d29cdff999c37b3876082278a8134a0642a02cd (diff) | |
| parent | dc87c3985e9b442c60994308a96f887579addc39 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/Makefile
drivers/usb/input/gtco.c
Diffstat (limited to 'drivers/char/ds1286.c')
| -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); |