OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[WATCHDOG] watchdog-driver-for-at32ap700x-devices-fix 

little fiddles.

Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Hans-Christian Egtvedt <hcegtvedt@atmel.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Andrew Morton 2007-06-07 16:06:43 -07:00 committed by Wim Van Sebroeck
parent a9cb3959ac
commit c37f271320
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/char/watchdog/at32ap700x_wdt.c
View File

@ -16,9 +16,8 @@
#include <linux/fs.h>
#include <linux/platform_device.h>
#include <linux/watchdog.h>
#include <asm/uaccess.h>
#include <asm/io.h>
#include <linux/uaccess.h>
#include <linux/io.h>
#define TIMEOUT_MIN 1
#define TIMEOUT_DEFAULT CONFIG_AT32AP700X_WDT_TIMEOUT
@ -120,7 +119,10 @@ static int at32_wdt_settimeout(int time)
if ((time < TIMEOUT_MIN) || (time > TIMEOUT_MAX))
return -EINVAL;
/* Set new watchdog time. It will be used when at32_wdt_start() is called. */
/*
* Set new watchdog time. It will be used when at32_wdt_start() is
* called.
*/
wdt->timeout = time;
return 0;
}
@ -141,7 +143,7 @@ static int at32_wdt_ioctl(struct inode *inode, struct file *file,
void __user *argp = (void __user *)arg;
int __user *p = argp;
switch(cmd) {
switch (cmd) {
case WDIOC_KEEPALIVE:
at32_wdt_pat();
ret = 0;
@ -182,7 +184,8 @@ static int at32_wdt_ioctl(struct inode *inode, struct file *file,
return ret;
}
static ssize_t at32_wdt_write(struct file *file, const char *data, size_t len, loff_t *ppos)
static ssize_t at32_wdt_write(struct file *file, const char *data, size_t len,
loff_t *ppos)
{
at32_wdt_pat();
return len;