diff options
author | 2017-05-20 08:35:27 -0700 | |
---|---|---|
committer | 2017-05-20 08:35:27 -0700 | |
commit | ec53c027f3e6b0ee82a5d18de7b0d8bfae3ec374 (patch) | |
tree | aacd536cf8c7562c8a0464821cd3e53c4ce27399 /drivers/watchdog/zx2967_wdt.c | |
parent | Merge tag 'drm-fixes-for-v4.12-rc2' of git://people.freedesktop.org/~airlied/... (diff) | |
parent | watchdog: bcm281xx: Fix use of uninitialized spinlock. (diff) | |
download | linux-ec53c027f3e6b0ee82a5d18de7b0d8bfae3ec374.tar.gz linux-ec53c027f3e6b0ee82a5d18de7b0d8bfae3ec374.tar.bz2 linux-ec53c027f3e6b0ee82a5d18de7b0d8bfae3ec374.zip |
Merge git://www.linux-watchdog.org/linux-watchdog
Pull watchdog fixes from Wim Van Sebroeck:
- orion_wdt compile-test dependencies
- sama5d4_wdt: WDDIS handling and a race confition
- pcwd_usb: fix NULL-deref at probe
- cadence_wdt: fix timeout setting
- wdt_pci: fix build error if SOFTWARE_REBOOT is defined
- iTCO_wdt: all versions count down twice
- zx2967: remove redundant dev_err call in zx2967_wdt_probe()
- bcm281xx: Fix use of uninitialized spinlock
* git://www.linux-watchdog.org/linux-watchdog:
watchdog: bcm281xx: Fix use of uninitialized spinlock.
watchdog: zx2967: remove redundant dev_err call in zx2967_wdt_probe()
iTCO_wdt: all versions count down twice
watchdog: wdt_pci: fix build error if define SOFTWARE_REBOOT
watchdog: cadence_wdt: fix timeout setting
watchdog: pcwd_usb: fix NULL-deref at probe
watchdog: sama5d4: fix race condition
watchdog: sama5d4: fix WDDIS handling
watchdog: orion: fix compile-test dependencies
Diffstat (limited to 'drivers/watchdog/zx2967_wdt.c')
-rw-r--r-- | drivers/watchdog/zx2967_wdt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/watchdog/zx2967_wdt.c b/drivers/watchdog/zx2967_wdt.c index e290d5a13a6d..c98252733c30 100644 --- a/drivers/watchdog/zx2967_wdt.c +++ b/drivers/watchdog/zx2967_wdt.c @@ -211,10 +211,8 @@ static int zx2967_wdt_probe(struct platform_device *pdev) base = platform_get_resource(pdev, IORESOURCE_MEM, 0); wdt->reg_base = devm_ioremap_resource(dev, base); - if (IS_ERR(wdt->reg_base)) { - dev_err(dev, "ioremap failed\n"); + if (IS_ERR(wdt->reg_base)) return PTR_ERR(wdt->reg_base); - } zx2967_wdt_reset_sysctrl(dev); |