From 75b7bd9cb5e87b4a6954060882b64b505129ad9d Mon Sep 17 00:00:00 2001 From: Corey Minyard Date: Tue, 20 Nov 2007 12:14:46 -0800 Subject: [PATCH] --- yaml --- r: 74908 b: refs/heads/master c: 783e6bcde4e6a7c849fa5fa7f35b0fba721ac5f4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/ipmi/ipmi_watchdog.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ea3a9249e6c9..415cd64cf3a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 38ff6fd2fa4959925cf217ccaebea90fabd8ce04 +refs/heads/master: 783e6bcde4e6a7c849fa5fa7f35b0fba721ac5f4 diff --git a/trunk/drivers/char/ipmi/ipmi_watchdog.c b/trunk/drivers/char/ipmi/ipmi_watchdog.c index e686fc925168..8f45ca9235ad 100644 --- a/trunk/drivers/char/ipmi/ipmi_watchdog.c +++ b/trunk/drivers/char/ipmi/ipmi_watchdog.c @@ -669,6 +669,7 @@ static int ipmi_ioctl(struct inode *inode, struct file *file, return 0; case WDIOC_SET_PRETIMEOUT: + case WDIOC_SETPRETIMEOUT: i = copy_from_user(&val, argp, sizeof(int)); if (i) return -EFAULT; @@ -676,6 +677,7 @@ static int ipmi_ioctl(struct inode *inode, struct file *file, return ipmi_set_timeout(IPMI_SET_TIMEOUT_HB_IF_NECESSARY); case WDIOC_GET_PRETIMEOUT: + case WDIOC_GETPRETIMEOUT: i = copy_to_user(argp, &pretimeout, sizeof(pretimeout)); if (i) return -EFAULT;