diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-06 21:11:31 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-06-06 21:11:31 +0200 |
| commit | 4bcbfff618f92f770dff28c8d3320fc96acf52df (patch) | |
| tree | 2d8d8d1cf804d0b60a43e47a43b9b72570b436dd | |
| parent | 1c3cc11602111d1318c2a5743bd2e88c82813927 (diff) | |
| parent | d576fe49ca5c238e99d2d010a410480cb2aa29a0 (diff) | |
| download | linux-4bcbfff618f92f770dff28c8d3320fc96acf52df.tar.gz linux-4bcbfff618f92f770dff28c8d3320fc96acf52df.tar.bz2 linux-4bcbfff618f92f770dff28c8d3320fc96acf52df.zip | |
Merge branch 'fortglx/3.0/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux into timers/urgent
| -rw-r--r-- | drivers/rtc/interface.c | 2 | ||||
| -rw-r--r-- | drivers/rtc/rtc-dev.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index ef6316acec43..df68618f6dbb 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c @@ -318,7 +318,7 @@ int rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) } EXPORT_SYMBOL_GPL(rtc_read_alarm); -int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) +static int __rtc_set_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm) { struct rtc_time tm; long now, scheduled; diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c index d0e06edb14c5..cace6d3aed9a 100644 --- a/drivers/rtc/rtc-dev.c +++ b/drivers/rtc/rtc-dev.c @@ -421,7 +421,8 @@ static long rtc_dev_ioctl(struct file *file, err = ops->ioctl(rtc->dev.parent, cmd, arg); if (err == -ENOIOCTLCMD) err = -ENOTTY; - } + } else + err = -ENOTTY; break; } |