commit f3c87a8999c28f2948ebd407574f7e9fb5c577b2

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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()

Linus Torvalds 19 years ago f3c87a89 2fee7b18

+2 -2

2 changed files

expand all

unified split

drivers

char

watchdog

iTCO_wdt.c

pnx4008_wdt.c

+1 -1

drivers/char/watchdog/iTCO_wdt.c

··· 494 } 495 496 default: 497 - return -ENOIOCTLCMD; 498 } 499 } 500

··· 494 } 495 496 default: 497 + return -ENOTTY; 498 } 499 } 500

+1 -1

drivers/char/watchdog/pnx4008_wdt.c

··· 184 pnx4008_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 185 unsigned long arg) 186 { 187 - int ret = -ENOIOCTLCMD; 188 int time; 189 190 switch (cmd) {

··· 184 pnx4008_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, 185 unsigned long arg) 186 { 187 + int ret = -ENOTTY; 188 int time; 189 190 switch (cmd) {