git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
char
/
watchdog
/
w83627hf_wdt.c
diff --git
a/drivers/char/watchdog/w83627hf_wdt.c
b/drivers/char/watchdog/w83627hf_wdt.c
index
7a12930
..
13f16d4
100644
(file)
--- a/
drivers/char/watchdog/w83627hf_wdt.c
+++ b/
drivers/char/watchdog/w83627hf_wdt.c
@@
-54,12
+54,7
@@
static int timeout = WATCHDOG_TIMEOUT; /* in seconds */
module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=63, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
module_param(timeout, int, 0);
MODULE_PARM_DESC(timeout, "Watchdog timeout in seconds. 1<= timeout <=63, default=" __MODULE_STRING(WATCHDOG_TIMEOUT) ".");
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
-static int nowayout = 1;
-#else
-static int nowayout = 0;
-#endif
-
+static int nowayout = WATCHDOG_NOWAYOUT;
module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
module_param(nowayout, int, 0);
MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
@@
-98,6
+93,12
@@
w83627hf_init(void)
w83627hf_select_wd_register();
w83627hf_select_wd_register();
+ outb_p(0xF6, WDT_EFER); /* Select CRF6 */
+ t=inb_p(WDT_EFDR); /* read CRF6 */
+ if (t != 0) {
+ printk (KERN_INFO PFX "Watchdog already running. Resetting timeout to %d sec\n", timeout);
+ outb_p(timeout, WDT_EFDR); /* Write back to CRF6 */
+ }
outb_p(0xF5, WDT_EFER); /* Select CRF5 */
t=inb_p(WDT_EFDR); /* read CRF5 */
t&=~0x0C; /* set second mode & disable keyboard turning off watchdog */
outb_p(0xF5, WDT_EFER); /* Select CRF5 */
t=inb_p(WDT_EFDR); /* read CRF5 */
t&=~0x0C; /* set second mode & disable keyboard turning off watchdog */
@@
-142,12
+143,8
@@
wdt_set_heartbeat(int t)
}
static ssize_t
}
static ssize_t
-wdt_write(struct file *file, const char *buf, size_t count, loff_t *ppos)
+wdt_write(struct file *file, const char
__user
*buf, size_t count, loff_t *ppos)
{
{
- /* Can't seek (pwrite) on this device */
- if (ppos != &file->f_pos)
- return -ESPIPE;
-
if (count) {
if (!nowayout) {
size_t i;
if (count) {
if (!nowayout) {
size_t i;
@@
-171,6
+168,8
@@
static int
wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
unsigned long arg)
{
+ void __user *argp = (void __user *)arg;
+ int __user *p = argp;
int new_timeout;
static struct watchdog_info ident = {
.options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
int new_timeout;
static struct watchdog_info ident = {
.options = WDIOF_KEEPALIVEPING | WDIOF_SETTIMEOUT | WDIOF_MAGICCLOSE,
@@
-180,20
+179,20
@@
wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
switch (cmd) {
case WDIOC_GETSUPPORT:
switch (cmd) {
case WDIOC_GETSUPPORT:
- if (copy_to_user(
(struct watchdog_info *)arg
, &ident, sizeof(ident)))
+ if (copy_to_user(
argp
, &ident, sizeof(ident)))
return -EFAULT;
break;
case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS:
return -EFAULT;
break;
case WDIOC_GETSTATUS:
case WDIOC_GETBOOTSTATUS:
- return put_user(0,
(int *)arg
);
+ return put_user(0,
p
);
case WDIOC_KEEPALIVE:
wdt_ping();
break;
case WDIOC_SETTIMEOUT:
case WDIOC_KEEPALIVE:
wdt_ping();
break;
case WDIOC_SETTIMEOUT:
- if (get_user(new_timeout,
(int *)arg
))
+ if (get_user(new_timeout,
p
))
return -EFAULT;
if (wdt_set_heartbeat(new_timeout))
return -EINVAL;
return -EFAULT;
if (wdt_set_heartbeat(new_timeout))
return -EINVAL;
@@
-201,13
+200,13
@@
wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
/* Fall */
case WDIOC_GETTIMEOUT:
/* Fall */
case WDIOC_GETTIMEOUT:
- return put_user(timeout,
(int *)arg
);
+ return put_user(timeout,
p
);
case WDIOC_SETOPTIONS:
{
int options, retval = -EINVAL;
case WDIOC_SETOPTIONS:
{
int options, retval = -EINVAL;
- if (get_user(options,
(int *)arg
))
+ if (get_user(options,
p
))
return -EFAULT;
if (options & WDIOS_DISABLECARD) {
return -EFAULT;
if (options & WDIOS_DISABLECARD) {
@@
-239,7
+238,7
@@
wdt_open(struct inode *inode, struct file *file)
*/
wdt_ping();
*/
wdt_ping();
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int
}
static int
@@
-275,7
+274,7
@@
wdt_notify_sys(struct notifier_block *this, unsigned long code,
* Kernel Interfaces
*/
* Kernel Interfaces
*/
-static struct file_operations wdt_fops = {
+static
const
struct file_operations wdt_fops = {
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = wdt_write,
.owner = THIS_MODULE,
.llseek = no_llseek,
.write = wdt_write,
@@
-360,5
+359,5
@@
module_exit(wdt_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Pádraig Brady <P@draigBrady.com>");
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Pádraig Brady <P@draigBrady.com>");
-MODULE_DESCRIPTION("w
38
627hf WDT driver");
+MODULE_DESCRIPTION("w
83
627hf WDT driver");
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);