Merge tag 'xfs-for-linus-3.16-rc1' of git://oss.sgi.com/xfs/xfs

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

diff --git a/drivers/gpio/gpio-tps6586x.c b/drivers/gpio/gpio-tps6586x.c
index 8994dfa13491bd0bb2a94ac6c72606b61c572e30..a69fbea41253877566f19c41706c08c97c813837 100644 (file)
--- a/drivers/gpio/gpio-tps6586x.c
+++ b/drivers/gpio/gpio-tps6586x.c
@@ -97,10 +97,8 @@ static int tps6586x_gpio_probe(struct platform_device *pdev)
        pdata = dev_get_platdata(pdev->dev.parent);
        tps6586x_gpio = devm_kzalloc(&pdev->dev,
                                sizeof(*tps6586x_gpio), GFP_KERNEL);
-       if (!tps6586x_gpio) {
-               dev_err(&pdev->dev, "Could not allocate tps6586x_gpio\n");
+       if (!tps6586x_gpio)
                return -ENOMEM;
-       }
 
        tps6586x_gpio->parent = pdev->dev.parent;