diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 02:15:49 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-14 02:15:49 -0400 |
| commit | 9aa7719e0c6a1580451900e672744752804f8f75 (patch) | |
| tree | ba36c5536342db2759d0a1843dffd0c193e26ff0 /drivers/rtc/rtc-dev.c | |
| parent | 583af252ab07cd1e8721878463da5b7016c18fdc (diff) | |
| parent | 2c53b436a30867eb6b47dd7bab23ba638d1fb0d2 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'drivers/rtc/rtc-dev.c')
| -rw-r--r-- | drivers/rtc/rtc-dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
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, | |||
| 421 | err = ops->ioctl(rtc->dev.parent, cmd, arg); | 421 | err = ops->ioctl(rtc->dev.parent, cmd, arg); |
| 422 | if (err == -ENOIOCTLCMD) | 422 | if (err == -ENOIOCTLCMD) |
| 423 | err = -ENOTTY; | 423 | err = -ENOTTY; |
| 424 | } | 424 | } else |
| 425 | err = -ENOTTY; | ||
| 425 | break; | 426 | break; |
| 426 | } | 427 | } |
| 427 | 428 | ||