Merge tag 'sound-fix-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[karo-tx-linux.git] / drivers / gpio / gpio-lynxpoint.c

diff --git a/drivers/gpio/gpio-lynxpoint.c b/drivers/gpio/gpio-lynxpoint.c
index 9a82a9074a2cfb3a74a1c56592eaf680dee1fbef..2bea89b72508b8a54f7857c6ec3ca46e91c1c45e 100644 (file)
--- a/drivers/gpio/gpio-lynxpoint.c
+++ b/drivers/gpio/gpio-lynxpoint.c
@@ -375,10 +375,8 @@ static int lp_gpio_probe(struct platform_device *pdev)
        int ret = -ENODEV;
 
        lg = devm_kzalloc(dev, sizeof(struct lp_gpio), GFP_KERNEL);
-       if (!lg) {
-               dev_err(dev, "can't allocate lp_gpio chip data\n");
+       if (!lg)
                return -ENOMEM;
-       }
 
        lg->pdev = pdev;
        platform_set_drvdata(pdev, lg);