Merge tag 'sh-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / drivers / watchdog / wm831x_wdt.c

diff --git a/drivers/watchdog/wm831x_wdt.c b/drivers/watchdog/wm831x_wdt.c
index e243bd01c774274813e48c7dbfdcb56e53af3197..2fa17e746ff6f43dfff2042d5306934c4eab4cf8 100644 (file)
--- a/drivers/watchdog/wm831x_wdt.c
+++ b/drivers/watchdog/wm831x_wdt.c
@@ -204,7 +204,6 @@ static int wm831x_wdt_probe(struct platform_device *pdev)
        driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data),
                                   GFP_KERNEL);
        if (!driver_data) {
-               dev_err(wm831x->dev, "Unable to alloacate watchdog device\n");
                ret = -ENOMEM;
                goto err;
        }