Merge tag 'v4.6-rc1' into for-linus-4.6

[deliverable/linux.git] / drivers / gpio / gpio-sta2x11.c

diff --git a/drivers/gpio/gpio-sta2x11.c b/drivers/gpio/gpio-sta2x11.c
index 83af1cb3633379e12328c531724717391a8e6978..0d5b8c525dd9c9fb6cf31db786edd6793b822df1 100644 (file)
--- a/drivers/gpio/gpio-sta2x11.c
+++ b/drivers/gpio/gpio-sta2x11.c
@@ -409,7 +409,7 @@ static int gsta_probe(struct platform_device *dev)
                goto err_free_descs;
        }
 
-       err = gpiochip_add_data(&chip->gpio, chip);
+       err = devm_gpiochip_add_data(&dev->dev, &chip->gpio, chip);
        if (err < 0) {
                dev_err(&dev->dev, "sta2x11 gpio: Can't register (%i)\n",
                        -err);