Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus

[firefly-linux-kernel-4.4.55.git] / drivers / watchdog / bcm2835_wdt.c

diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index cafa973c43be7af984fb9d39456b1d36b8913ea8..8df450c090a913d0394ca16c5ae241fd7d233db6 100644 (file)
--- a/drivers/watchdog/bcm2835_wdt.c
+++ b/drivers/watchdog/bcm2835_wdt.c
@@ -114,10 +114,8 @@ static int bcm2835_wdt_probe(struct platform_device *pdev)
        int err;
 
        wdt = devm_kzalloc(dev, sizeof(struct bcm2835_wdt), GFP_KERNEL);
-       if (!wdt) {
-               dev_err(dev, "Failed to allocate memory for watchdog device");
+       if (!wdt)
                return -ENOMEM;
-       }
        platform_set_drvdata(pdev, wdt);
 
        spin_lock_init(&wdt->lock);