Skip to content

Commit

Permalink
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
Browse files Browse the repository at this point in the history
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()
  • Loading branch information
Linus Torvalds committed Oct 3, 2006
2 parents 2fee7b1 + f311896 commit f3c87a8
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/char/watchdog/iTCO_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ static int iTCO_wdt_ioctl (struct inode *inode, struct file *file,
}

default:
return -ENOIOCTLCMD;
return -ENOTTY;
}
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/char/watchdog/pnx4008_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit f3c87a8

Please sign in to comment.