aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/stmp3xxx_wdt.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2012-02-22 20:36:17 -0500
committerGrant Likely <grant.likely@secretlab.ca>2012-02-22 20:36:17 -0500
commitdaefd89efc279b142bbb054577c2d706da211723 (patch)
tree2298056232548f6f22d7bbff2662a2bbf64520de /drivers/watchdog/stmp3xxx_wdt.c
parent6e33aceda2d82126e9d08a39e21a15be0dd00a6c (diff)
parentf86bcc302a8c570dd0f5a50097a6af96a0e717c2 (diff)
Merge branch 'for_3.4/gpio/runtime-pm-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next
Diffstat (limited to 'drivers/watchdog/stmp3xxx_wdt.c')
-rw-r--r--drivers/watchdog/stmp3xxx_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/stmp3xxx_wdt.c b/drivers/watchdog/stmp3xxx_wdt.c
index 4c2a4e8698f9..e37d81178b9e 100644
--- a/drivers/watchdog/stmp3xxx_wdt.c
+++ b/drivers/watchdog/stmp3xxx_wdt.c
@@ -174,7 +174,7 @@ static int stmp3xxx_wdt_release(struct inode *inode, struct file *file)
174 if (!nowayout) { 174 if (!nowayout) {
175 if (!test_bit(WDT_OK_TO_CLOSE, &wdt_status)) { 175 if (!test_bit(WDT_OK_TO_CLOSE, &wdt_status)) {
176 wdt_ping(); 176 wdt_ping();
177 pr_debug("%s: Device closed unexpectdly\n", __func__); 177 pr_debug("%s: Device closed unexpectedly\n", __func__);
178 ret = -EINVAL; 178 ret = -EINVAL;
179 } else { 179 } else {
180 wdt_disable(); 180 wdt_disable();