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

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

diff --git a/drivers/gpio/gpio-moxart.c b/drivers/gpio/gpio-moxart.c
index ccd45704e5fdc1f5c4a089e9dd6f994c8eb10a67..4661e181be0481e65f6758919db714b2ca48e360 100644 (file)
--- a/drivers/gpio/gpio-moxart.c
+++ b/drivers/gpio/gpio-moxart.c
@@ -113,10 +113,8 @@ static int moxart_gpio_probe(struct platform_device *pdev)
        int ret;
 
        mgc = devm_kzalloc(dev, sizeof(*mgc), GFP_KERNEL);
-       if (!mgc) {
-               dev_err(dev, "can't allocate GPIO chip container\n");
+       if (!mgc)
                return -ENOMEM;
-       }
        mgc->gpio = moxart_template_chip;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);