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

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

mfd: lp8788: Fix an error handling path in lp8788_irq_init() and lp8788_irq_init() 



[ Upstream commit 557244f6284f30613f2d61f14b579303165876c3 ]

In lp8788_irq_init(), if an error occurs after a successful
irq_domain_add_linear() call, it must be undone by a corresponding
irq_domain_remove() call.

irq_domain_remove() should also be called in lp8788_irq_exit() for the same
reason.

Fixes: eea6b7cc ("mfd: Add lp8788 mfd driver")
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/bcd5a72c9c1c383dd6324680116426e32737655a.1659261275.git.christophe.jaillet@wanadoo.fr


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

drivers/mfd/lp8788-irq.c

+3 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ int lp8788_irq_init(struct lp8788 *lp, int irq) 
				IRQF_TRIGGER_FALLING | IRQF_ONESHOT,

				"lp8788-irq", irqd);

	if (ret) {

		irq_domain_remove(lp->irqdm);

		dev_err(lp->dev, "failed to create a thread for IRQ_N\n");

		return ret;

	}
@@ -192,4 +193,6 @@ void lp8788_irq_exit(struct lp8788 *lp) 
{

	if (lp->irq)

		free_irq(lp->irq, lp->irqdm);

	if (lp->irqdm)

		irq_domain_remove(lp->irqdm);

}