---

yaml
---
r: 63504
b: refs/heads/master
c: f1a08cc
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de81225a8719494f5149980ea8a50de28da653f6
+refs/heads/master: f1a08cc9a1a8f1da79ca751469ecff82be110482

trunk/drivers/char/watchdog/davinci_wdt.c

@@ -132,18 +132,14 @@ 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();
 
 	return 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;