diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:56:44 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:56:44 +0000 |
| commit | 4045407fd7740642b18bc802e8bab064e79a61e5 (patch) | |
| tree | 9412a38886bfad562bc5897c6e4c23bb88703204 /drivers/watchdog/wm831x_wdt.c | |
| parent | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (diff) | |
| parent | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 (diff) | |
| download | talos-op-linux-4045407fd7740642b18bc802e8bab064e79a61e5.tar.gz talos-op-linux-4045407fd7740642b18bc802e8bab064e79a61e5.zip | |
Merge branch 'restart-cleanup' into restart
Conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'drivers/watchdog/wm831x_wdt.c')
| -rw-r--r-- | drivers/watchdog/wm831x_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c index 7be38556aed0..e789a47db41f 100644 --- a/drivers/watchdog/wm831x_wdt.c +++ b/drivers/watchdog/wm831x_wdt.c @@ -150,7 +150,7 @@ static int wm831x_wdt_set_timeout(struct watchdog_device *wdt_dev, if (wm831x_wdt_cfgs[i].time == timeout) break; if (i == ARRAY_SIZE(wm831x_wdt_cfgs)) - ret = -EINVAL; + return -EINVAL; ret = wm831x_reg_unlock(wm831x); if (ret == 0) { |
