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

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

diff --git a/drivers/watchdog/da9055_wdt.c b/drivers/watchdog/da9055_wdt.c
index 575f37a965a471ba93a77a4bdda5840f0dc7b8e0..495089d8dbfeb7965142c48f2579672ed8882d6c 100644 (file)
--- a/drivers/watchdog/da9055_wdt.c
+++ b/drivers/watchdog/da9055_wdt.c
@@ -151,10 +151,8 @@ static int da9055_wdt_probe(struct platform_device *pdev)
 
        driver_data = devm_kzalloc(&pdev->dev, sizeof(*driver_data),
                                   GFP_KERNEL);
-       if (!driver_data) {
-               dev_err(da9055->dev, "Failed to allocate watchdog device\n");
+       if (!driver_data)
                return -ENOMEM;
-       }
 
        driver_data->da9055 = da9055;