Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / drivers / gpio / gpio-bcm-kona.c

diff --git a/drivers/gpio/gpio-bcm-kona.c b/drivers/gpio/gpio-bcm-kona.c
index b6c5abe85dafef89d001b55d3b278de830a9ce5a..2fd38d598f3de8912e19fdddc1f13b1194ef393e 100644 (file)
--- a/drivers/gpio/gpio-bcm-kona.c
+++ b/drivers/gpio/gpio-bcm-kona.c
@@ -630,7 +630,7 @@ static int bcm_kona_gpio_probe(struct platform_device *pdev)
 
        bcm_kona_gpio_reset(kona_gpio);
 
-       ret = gpiochip_add_data(chip, kona_gpio);
+       ret = devm_gpiochip_add_data(dev, chip, kona_gpio);
        if (ret < 0) {
                dev_err(dev, "Couldn't add GPIO chip -- %d\n", ret);
                goto err_irq_domain;