]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
gpio: exar: Allocate resources on behalf of the platform device
authorJan Kiszka <jan.kiszka@siemens.com>
Fri, 9 Jun 2017 18:33:11 +0000 (20:33 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Tue, 20 Jun 2017 08:14:03 +0000 (10:14 +0200)
Do not allocate resources on behalf of the parent device but on our own.
Otherwise, cleanup does not properly work if gpio-exar is removed but
not the parent device.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-exar.c

index 85bf031d9772f2908ee7f19f58cb5ab899055717..c5f5182d6cf06100c04fd37aad0eb34b77621ece 100644 (file)
@@ -139,7 +139,7 @@ static int gpio_exar_probe(struct platform_device *pdev)
        if (!p)
                return -ENOMEM;
 
-       exar_gpio = devm_kzalloc(&pcidev->dev, sizeof(*exar_gpio), GFP_KERNEL);
+       exar_gpio = devm_kzalloc(&pdev->dev, sizeof(*exar_gpio), GFP_KERNEL);
        if (!exar_gpio)
                return -ENOMEM;
 
@@ -160,7 +160,7 @@ static int gpio_exar_probe(struct platform_device *pdev)
        exar_gpio->regs = p;
        exar_gpio->index = index;
 
-       ret = devm_gpiochip_add_data(&pcidev->dev,
+       ret = devm_gpiochip_add_data(&pdev->dev,
                                     &exar_gpio->gpio_chip, exar_gpio);
        if (ret)
                goto err_destroy;