Commit 7d658893 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Bartosz Golaszewski
Browse files

gpio: mpc8xxx: Fix a potential double iounmap call in 'mpc8xxx_probe()' 



Commit 76c47d14 ("gpio: mpc8xxx: Add ACPI support") has switched to a
managed version when dealing with 'mpc8xxx_gc->regs'. So the corresponding
'iounmap()' call in the error handling path and in the remove should be
removed to avoid a double unmap.

This also allows some simplification in the probe. All the error handling
paths related to managed resources can be direct returns and a NULL check
in what remains in the error handling path can be removed.

Fixes: 76c47d14 ("gpio: mpc8xxx: Add ACPI support")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
parent 555bda42

drivers/gpio/gpio-mpc8xxx.c

+4 −7
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ static int mpc8xxx_probe(struct platform_device *pdev) 
				 mpc8xxx_gc->regs + GPIO_DIR, NULL,

				 BGPIOF_BIG_ENDIAN);

		if (ret)

			goto err;

			return ret;

		dev_dbg(&pdev->dev, "GPIO registers are LITTLE endian\n");

	} else {

		ret = bgpio_init(gc, &pdev->dev, 4,
@@ -342,7 +342,7 @@ static int mpc8xxx_probe(struct platform_device *pdev) 
				 BGPIOF_BIG_ENDIAN

				 | BGPIOF_BIG_ENDIAN_BYTE_ORDER);

		if (ret)

			goto err;

			return ret;

		dev_dbg(&pdev->dev, "GPIO registers are BIG endian\n");

	}
@@ -384,7 +384,7 @@ static int mpc8xxx_probe(struct platform_device *pdev) 
	if (ret) {

		dev_err(&pdev->dev,

			"GPIO chip registration failed with status %d\n", ret);

		goto err;

		return ret;

	}



	mpc8xxx_gc->irqn = platform_get_irq(pdev, 0);
@@ -416,9 +416,7 @@ static int mpc8xxx_probe(struct platform_device *pdev) 


	return 0;

err:

	if (mpc8xxx_gc->irq)

	irq_domain_remove(mpc8xxx_gc->irq);

	iounmap(mpc8xxx_gc->regs);

	return ret;

}
@@ -432,7 +430,6 @@ static int mpc8xxx_remove(struct platform_device *pdev) 
	}



	gpiochip_remove(&mpc8xxx_gc->gc);

	iounmap(mpc8xxx_gc->regs);



	return 0;

}