]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
gpio: intel-mid: switch to devm_gpiochip_add_data()
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Sun, 19 Jun 2016 20:49:57 +0000 (23:49 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 20 Aug 2016 16:10:49 +0000 (18:10 +0200)
commit dd3b204af11b50be6dc77e18b88b3c646bba354c upstream.

The error handling is not correct since the commit 3f7dbfd8eea9 ("gpio:
intel-mid: switch to using gpiolib irqchip helpers"). Switch to devres API to
fix the potential resource leak.

Fixes: commit 3f7dbfd8eea9 ("gpio: intel-mid: switch to using gpiolib irqchip helpers")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpio/gpio-intel-mid.c

index d709f15d060657e792953aeb5aa536e064e12d8f..c0f7cce23f620aabe25b2099ffd7c14fbefdfa8e 100644 (file)
@@ -382,7 +382,7 @@ static int intel_gpio_probe(struct pci_dev *pdev,
        spin_lock_init(&priv->lock);
 
        pci_set_drvdata(pdev, priv);
-       retval = gpiochip_add_data(&priv->chip, priv);
+       retval = devm_gpiochip_add_data(&pdev->dev, &priv->chip, priv);
        if (retval) {
                dev_err(&pdev->dev, "gpiochip_add error %d\n", retval);
                return retval;