Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

Linus Torvalds · Linus Torvalds · commit f3c87a8999c2 · 2006-10-03T14:32:06.000-07:00
* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] use ENOTTY instead of ENOIOCTLCMD in ioctl()
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -494,7 +494,7 @@ static int iTCO_wdt_ioctl (struct inode inode, struct file file,`
`494`	`494`	`}`
`495`	`495`
`496`	`496`	`default:`
`497`		`- return -ENOIOCTLCMD;`
	`497`	`+ return -ENOTTY;`
`498`	`498`	`}`
`499`	`499`	`}`
`500`	`500`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ static int`
`184`	`184`	`pnx4008_wdt_ioctl(struct inode inode, struct file file, unsigned int cmd,`
`185`	`185`	`unsigned long arg)`
`186`	`186`	`{`
`187`		`- int ret = -ENOIOCTLCMD;`
	`187`	`+ int ret = -ENOTTY;`
`188`	`188`	`int time;`
`189`	`189`
`190`	`190`	`switch (cmd) {`