Merge remote-tracking branch 'wireless-next/master' into mac80211-next

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-davinci.c

diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c
index 339f9dac591bf0e28b85644d6538b3caec782818..9f0682534e2f46376a7086bc306cf195cc6e8e6f 100644 (file)
--- a/drivers/gpio/gpio-davinci.c
+++ b/drivers/gpio/gpio-davinci.c
@@ -230,10 +230,8 @@ static int davinci_gpio_probe(struct platform_device *pdev)
        chips = devm_kzalloc(dev,
                             ngpio * sizeof(struct davinci_gpio_controller),
                             GFP_KERNEL);
-       if (!chips) {
-               dev_err(dev, "Memory allocation failed\n");
+       if (!chips)
                return -ENOMEM;
-       }
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        if (!res) {