diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-06-06 15:11:31 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-06-06 15:11:31 -0400 |
| commit | 4bcbfff618f92f770dff28c8d3320fc96acf52df (patch) | |
| tree | 2d8d8d1cf804d0b60a43e47a43b9b72570b436dd /drivers/rtc/rtc-dev.c | |
| parent | 1c3cc11602111d1318c2a5743bd2e88c82813927 (diff) | |
| parent | d576fe49ca5c238e99d2d010a410480cb2aa29a0 (diff) | |
Merge branch 'fortglx/3.0/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux into timers/urgent
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 | ||