Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 105477
b: refs/heads/master
c: 4c228db
h: refs/heads/master
i:
  105475: 803b234
v: v3
  • Loading branch information
Maciej W. Rozycki authored and Linus Torvalds committed Jul 24, 2008
1 parent 4ba4c3b commit b85dccc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 35aa64f3a117a16c466f688f52ac3847b3b572e8
refs/heads/master: 4c228db0b30fa12d65ae7461ce29ed1f4da12c5b
6 changes: 2 additions & 4 deletions trunk/drivers/rtc/rtc-m41t80.c
Original file line number Diff line number Diff line change
Expand Up @@ -631,14 +631,12 @@ static int wdt_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
return -EFAULT;

if (rv & WDIOS_DISABLECARD) {
printk(KERN_INFO
"rtc-m41t80: disable watchdog\n");
pr_info("rtc-m41t80: disable watchdog\n");
wdt_disable();
}

if (rv & WDIOS_ENABLECARD) {
printk(KERN_INFO
"rtc-m41t80: enable watchdog\n");
pr_info("rtc-m41t80: enable watchdog\n");
wdt_ping();
}

Expand Down

0 comments on commit b85dccc

Please sign in to comment.