Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1655969

[PATCH v5 04/11] gpio: exar: Allocate resources on behalf of the platform device

Show all headers | View raw

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>
---
 drivers/gpio/gpio-exar.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpio/gpio-exar.c b/drivers/gpio/gpio-exar.c
index da4550bb9939..65126fa1e512 100644
--- a/drivers/gpio/gpio-exar.c
+++ b/drivers/gpio/gpio-exar.c
@@ -136,7 +136,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;
 
@@ -157,7 +157,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;
-- 
2.12.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v5 00/11] serial/gpio: exar: Fixes and support for IOT2000 Jan Kiszka <jan.kiszka@siemens.com> - 2017-06-02 09:30 +0200
  [PATCH v5 01/11] serial: exar: Leave MPIOs as output for Commtech adapters Jan Kiszka <jan.kiszka@siemens.com> - 2017-06-02 09:30 +0200
  [PATCH v5 04/11] gpio: exar: Allocate resources on behalf of the platform device Jan Kiszka <jan.kiszka@siemens.com> - 2017-06-02 09:30 +0200
  [PATCH v5 11/11] serial: exar: Add support for IOT2040 device Jan Kiszka <jan.kiszka@siemens.com> - 2017-06-02 09:40 +0200
  [PATCH v5 05/11] gpio: exar: Fix iomap request Jan Kiszka <jan.kiszka@siemens.com> - 2017-06-02 09:40 +0200
  [PATCH v5 02/11] gpio-exar/8250-exar: Do not even instantiate a GPIO device for Commtech cards Jan Kiszka <jan.kiszka@siemens.com> - 2017-06-02 09:40 +0200
  [PATCH v5 08/11] serial: exar: Factor out platform hooks Jan Kiszka <jan.kiszka@siemens.com> - 2017-06-02 09:40 +0200
  [PATCH v5 07/11] gpio-exar/8250-exar: Rearrange gpiochip parenthood Jan Kiszka <jan.kiszka@siemens.com> - 2017-06-02 09:40 +0200
  [PATCH v5 10/11] gpio-exar/8250-exar: Make set of exported GPIOs configurable Jan Kiszka <jan.kiszka@siemens.com> - 2017-06-02 09:40 +0200
    Re: [PATCH v5 10/11] gpio-exar/8250-exar: Make set of exported GPIOs configurable Andy Shevchenko <andy.shevchenko@gmail.com> - 2017-06-02 12:40 +0200
  [PATCH v5 03/11] gpio-exar/8250-exar: Fix passing in of parent PCI device Jan Kiszka <jan.kiszka@siemens.com> - 2017-06-02 09:40 +0200
  [PATCH v5 06/11] gpio: exar: Fix reading of directions and values Jan Kiszka <jan.kiszka@siemens.com> - 2017-06-02 09:40 +0200
  [PATCH v5 09/11] platform: Accept const properties Jan Kiszka <jan.kiszka@siemens.com> - 2017-06-02 09:40 +0200

csiph-web