Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acbed9e8 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

mfd: fsl-imx25: Fix an error handling path in mx25_tsadc_setup_irq() 



[ Upstream commit 3fa9e4cfb55da512ebfd57336fde468830719298 ]

If devm_of_platform_populate() fails, some resources need to be
released.

Introduce a mx25_tsadc_unset_irq() function that undoes
mx25_tsadc_setup_irq() and call it both from the new error handling path
of the probe and in the remove function.

Fixes: a55196ef ("mfd: fsl-imx25: Use devm_of_platform_populate()")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarLee Jones <lee@kernel.org>
Link: https://lore.kernel.org/r/d404e04828fc06bcfddf81f9f3e9b4babbe35415.1659269156.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent f81f6da8

drivers/mfd/fsl-imx25-tsadc.c

+24 −8
Original line number Diff line number Diff line
@@ -89,6 +89,19 @@ static int mx25_tsadc_setup_irq(struct platform_device *pdev, 
	return 0;

}



static int mx25_tsadc_unset_irq(struct platform_device *pdev)

{

	struct mx25_tsadc *tsadc = platform_get_drvdata(pdev);

	int irq = platform_get_irq(pdev, 0);



	if (irq) {

		irq_set_chained_handler_and_data(irq, NULL, NULL);

		irq_domain_remove(tsadc->domain);

	}



	return 0;

}



static void mx25_tsadc_setup_clk(struct platform_device *pdev,

				 struct mx25_tsadc *tsadc)

{
@@ -176,18 +189,21 @@ static int mx25_tsadc_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, tsadc);



	return devm_of_platform_populate(dev);

	ret = devm_of_platform_populate(dev);

	if (ret)

		goto err_irq;



	return 0;



err_irq:

	mx25_tsadc_unset_irq(pdev);



	return ret;

}



static int mx25_tsadc_remove(struct platform_device *pdev)

{

	struct mx25_tsadc *tsadc = platform_get_drvdata(pdev);

	int irq = platform_get_irq(pdev, 0);



	if (irq) {

		irq_set_chained_handler_and_data(irq, NULL, NULL);

		irq_domain_remove(tsadc->domain);

	}

	mx25_tsadc_unset_irq(pdev);



	return 0;

}