aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-11-12 18:51:04 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-11-12 18:51:04 +0000
commitab91049eb33f3bfee2f85928fd3f74b9d2f40ae1 (patch)
tree15a51e6562559016a76e75642eeb584de1851fb5 /target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
parentcea635ab150079bb18cc618b212e54b33192ac33 (diff)
downloadupstream-ab91049eb33f3bfee2f85928fd3f74b9d2f40ae1.tar.gz
upstream-ab91049eb33f3bfee2f85928fd3f74b9d2f40ae1.tar.bz2
upstream-ab91049eb33f3bfee2f85928fd3f74b9d2f40ae1.zip
ar71xx: wrap long lines
(build errors has been fixed - juhosg) Signed-off-by: Arnaud Lacombe <lacombar@gmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23977 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c')
-rw-r--r--target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
index 6b5ff21a9b..b8b2b03c0e 100644
--- a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
+++ b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c
@@ -215,9 +215,8 @@ static int __devinit ar71xx_wdt_probe(struct platform_device *pdev)
max_timeout = (0xfffffffful / ar71xx_ahb_freq);
wdt_timeout = (max_timeout < WDT_TIMEOUT) ? max_timeout : WDT_TIMEOUT;
- boot_status =
- (ar71xx_reset_rr(AR71XX_RESET_REG_WDOG_CTRL) & WDOG_CTRL_LAST_RESET) ?
- WDIOF_CARDRESET : 0;
+ if (ar71xx_reset_rr(AR71XX_RESET_REG_WDOG_CTRL) & WDOG_CTRL_LAST_RESET)
+ boot_status = WDIOF_CARDRESET;
ret = misc_register(&ar71xx_wdt_miscdev);
if (ret)