Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=f1a08cc9a1a8f1da79ca751469ecff82be110482
Commit:     f1a08cc9a1a8f1da79ca751469ecff82be110482
Parent:     de81225a8719494f5149980ea8a50de28da653f6
Author:     Wim Van Sebroeck <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 20 21:47:55 2007 +0000
Committer:  Wim Van Sebroeck <[EMAIL PROTECTED]>
CommitDate: Mon Jul 23 17:24:38 2007 +0000

    [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 <[EMAIL PROTECTED]>
---
 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 27b4f66..19db530 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;
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to