diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-22 14:26:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-22 14:26:25 -0400 |
| commit | 3b38f317e529d8396377dafc7d95a1451a151df5 (patch) | |
| tree | 65e80799417c456bdd907b7d80182732be02e5f4 /drivers/rtc/rtc-dev.c | |
| parent | 5d25ea7c0c77cbdba1b5f092d60d624e24dfa938 (diff) | |
| parent | 353b28bafd1b962359a866ff263a7fad833d29a1 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/rtc/rtc-dev.c')
| -rw-r--r-- | drivers/rtc/rtc-dev.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c index 6c9ad92747f..2011567005f 100644 --- a/drivers/rtc/rtc-dev.c +++ b/drivers/rtc/rtc-dev.c @@ -141,13 +141,13 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file, /* try the driver's ioctl interface */ if (ops->ioctl) { err = ops->ioctl(class_dev->dev, cmd, arg); - if (err != -EINVAL) + if (err != -ENOIOCTLCMD) return err; } /* if the driver does not provide the ioctl interface * or if that particular ioctl was not implemented - * (-EINVAL), we will try to emulate here. + * (-ENOIOCTLCMD), we will try to emulate here. */ switch (cmd) { @@ -233,7 +233,7 @@ static int rtc_dev_ioctl(struct inode *inode, struct file *file, break; default: - err = -EINVAL; + err = -ENOTTY; break; } |