| Message ID | b8af1f01cc987d78a8677fcc3709595f8e5b0f38.1629472813.git.christophe.jaillet@wanadoo.fr |
|---|---|
| State | New |
| Headers | show |
| Series | gpio: mpc8xxx: Fix 3 errors related to the error handling path of the 'mpc8xxx_probe()' | expand |
On Fri, Aug 20, 2021 at 5:38 PM Christophe JAILLET <christophe.jaillet@wanadoo.fr> wrote: > > If an error occurs after a 'gpiochip_add_data()' call it must be undone by > a corresponding 'gpiochip_remove()' as already done in the remove function. > > To simplify the code a fix a leak in the error handling path of the probe, > use the managed version instead (i.e. 'devm_gpiochip_add_data()') > > Fixes: 698b8eeaed72 ("gpio/mpc8xxx: change irq handler from chained to normal") > Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> > --- > drivers/gpio/gpio-mpc8xxx.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c > index fa4aaeced3f1..70d6ae20b1da 100644 > --- a/drivers/gpio/gpio-mpc8xxx.c > +++ b/drivers/gpio/gpio-mpc8xxx.c > @@ -380,7 +380,7 @@ static int mpc8xxx_probe(struct platform_device *pdev) > is_acpi_node(fwnode)) > gc->write_reg(mpc8xxx_gc->regs + GPIO_IBE, 0xffffffff); > > - ret = gpiochip_add_data(gc, mpc8xxx_gc); > + ret = devm_gpiochip_add_data(&pdev->dev, gc, mpc8xxx_gc); > if (ret) { > dev_err(&pdev->dev, > "GPIO chip registration failed with status %d\n", ret); > @@ -429,8 +429,6 @@ static int mpc8xxx_remove(struct platform_device *pdev) > irq_domain_remove(mpc8xxx_gc->irq); > } > > - gpiochip_remove(&mpc8xxx_gc->gc); > - > return 0; > } > > -- > 2.30.2 > Applied, thanks! Bart
diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c index fa4aaeced3f1..70d6ae20b1da 100644 --- a/drivers/gpio/gpio-mpc8xxx.c +++ b/drivers/gpio/gpio-mpc8xxx.c @@ -380,7 +380,7 @@ static int mpc8xxx_probe(struct platform_device *pdev) is_acpi_node(fwnode)) gc->write_reg(mpc8xxx_gc->regs + GPIO_IBE, 0xffffffff); - ret = gpiochip_add_data(gc, mpc8xxx_gc); + ret = devm_gpiochip_add_data(&pdev->dev, gc, mpc8xxx_gc); if (ret) { dev_err(&pdev->dev, "GPIO chip registration failed with status %d\n", ret); @@ -429,8 +429,6 @@ static int mpc8xxx_remove(struct platform_device *pdev) irq_domain_remove(mpc8xxx_gc->irq); } - gpiochip_remove(&mpc8xxx_gc->gc); - return 0; }
If an error occurs after a 'gpiochip_add_data()' call it must be undone by a corresponding 'gpiochip_remove()' as already done in the remove function. To simplify the code a fix a leak in the error handling path of the probe, use the managed version instead (i.e. 'devm_gpiochip_add_data()') Fixes: 698b8eeaed72 ("gpio/mpc8xxx: change irq handler from chained to normal") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> --- drivers/gpio/gpio-mpc8xxx.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)