Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f3c87a89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 2fee7b18 f311896a

drivers/char/watchdog/iTCO_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static int iTCO_wdt_ioctl (struct inode *inode, struct file *file, 
		}



		default:

			return -ENOIOCTLCMD;

			return -ENOTTY;

	}

}

drivers/char/watchdog/pnx4008_wdt.c

+1 −1
Original line number Diff line number Diff line
@@ -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) {