diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 14:32:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 14:32:06 -0700 |
| commit | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (patch) | |
| tree | 658579ea5dc5de036b8b66c1a6fc9ea683481dba | |
| parent | 2fee7b18453d6a7e9ee2db0c7f7eec30f6898166 (diff) | |
| parent | f311896a990a0b766e279defe9adff29160ada03 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()
| -rw-r--r-- | drivers/char/watchdog/iTCO_wdt.c | 2 | ||||
| -rw-r--r-- | drivers/char/watchdog/pnx4008_wdt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/watchdog/iTCO_wdt.c b/drivers/char/watchdog/iTCO_wdt.c index ebd3fc8000e..8f89948832f 100644 --- a/drivers/char/watchdog/iTCO_wdt.c +++ b/drivers/char/watchdog/iTCO_wdt.c @@ -494,7 +494,7 @@ static int iTCO_wdt_ioctl (struct inode *inode, struct file *file, } default: - return -ENOIOCTLCMD; + return -ENOTTY; } } diff --git a/drivers/char/watchdog/pnx4008_wdt.c b/drivers/char/watchdog/pnx4008_wdt.c index e7f0450a939..db2731ba88e 100644 --- a/drivers/char/watchdog/pnx4008_wdt.c +++ b/drivers/char/watchdog/pnx4008_wdt.c @@ -184,7 +184,7 @@ static int pnx4008_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned long arg) { - int ret = -ENOIOCTLCMD; + int ret = -ENOTTY; int time; switch (cmd) { |