diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-07-20 23:47:55 +0200 |
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-07-23 19:24:38 +0200 |
| commit | f1a08cc9a1a8f1da79ca751469ecff82be110482 (patch) | |
| tree | 6fbaa129dd1445de663596e665a874ad0cda5393 /drivers | |
| parent | [WATCHDOG] mpc5200_wdt clean-up (diff) | |
| download | linux-f1a08cc9a1a8f1da79ca751469ecff82be110482.tar.xz linux-f1a08cc9a1a8f1da79ca751469ecff82be110482.zip | |
[WATCHDOG] davinci_wdt clean-up
* Remove the redundant check for pwrite(), given that the open() routine
already invokes nonseekable_open().
* The WDIOF_CARDRESET flag can only be used when you can read this status
via the WDIOC_GETSTATUS ioctl call.
* Add the mandatory WDIOC_GETBOOTSTATUS ioctl call.
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/watchdog/davinci_wdt.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/char/watchdog/davinci_wdt.c b/drivers/char/watchdog/davinci_wdt.c index 27b4f66c000b..19db5302ba6e 100644 --- a/drivers/char/watchdog/davinci_wdt.c +++ b/drivers/char/watchdog/davinci_wdt.c @@ -132,10 +132,6 @@ static ssize_t davinci_wdt_write(struct file *file, const char *data, size_t len, loff_t *ppos) { - /* Can't seek (pwrite) on this device */ - if (ppos != &file->f_pos) - return -ESPIPE; - if (len) wdt_service(); @@ -143,7 +139,7 @@ davinci_wdt_write(struct file *file, const char *data, size_t len, } static struct watchdog_info ident = { - .options = WDIOF_CARDRESET | WDIOF_KEEPALIVEPING, + .options = WDIOF_KEEPALIVEPING, .identity = "DaVinci Watchdog", }; @@ -160,6 +156,7 @@ davinci_wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd, break; case WDIOC_GETSTATUS: + case WDIOC_GETBOOTSTATUS: ret = put_user(0, (int *)arg); break; |