diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:32:42 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-05-24 01:32:42 -0400 |
commit | 26e27cd424554202d36f38ee35421143788da127 (patch) | |
tree | 04d068c76af5b636c061173465faa574d4b5e7b0 /drivers/rtc/rtc-vr41xx.c | |
parent | b74ba22f030eb7ab88f7d8954ad18ecc0ac5ce3c (diff) | |
parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
download | talos-op-linux-26e27cd424554202d36f38ee35421143788da127.tar.gz talos-op-linux-26e27cd424554202d36f38ee35421143788da127.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/rtc/rtc-vr41xx.c')
-rw-r--r-- | drivers/rtc/rtc-vr41xx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-vr41xx.c b/drivers/rtc/rtc-vr41xx.c index 4d49fd501198..277596c302e3 100644 --- a/drivers/rtc/rtc-vr41xx.c +++ b/drivers/rtc/rtc-vr41xx.c @@ -270,7 +270,7 @@ static int vr41xx_rtc_ioctl(struct device *dev, unsigned int cmd, unsigned long epoch = arg; break; default: - return -EINVAL; + return -ENOIOCTLCMD; } return 0; |