]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
extcon: extcon-max8997: Fix IRQ freeing at error path
authorMatti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Tue, 8 Jun 2021 10:10:31 +0000 (13:10 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 14 Jul 2021 14:59:41 +0000 (16:59 +0200)
[ Upstream commit 610bdc04830a864115e6928fc944f1171dfff6f3 ]

If reading MAX8997_MUIC_REG_STATUS1 fails at probe the driver exits
without freeing the requested IRQs.

Free the IRQs prior returning if reading the status fails.

Fixes: 3e34c8198960 ("extcon: max8997: Avoid forcing UART path on drive probe")
Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Chanwoo Choi <cw00.choi@samsung.com>
Link: https://lore.kernel.org/r/27ee4a48ee775c3f8c9d90459c18b6f2b15edc76.1623146580.git.matti.vaittinen@fi.rohmeurope.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/extcon/extcon-max8997.c

index 337b0eea4e629ea00dd55e96a75299e663a1a67c..5c4f7746cbee756e43e281c952cb9380168e52d8 100644 (file)
@@ -729,7 +729,7 @@ static int max8997_muic_probe(struct platform_device *pdev)
                                2, info->status);
        if (ret) {
                dev_err(info->dev, "failed to read MUIC register\n");
-               return ret;
+               goto err_irq;
        }
        cable_type = max8997_muic_get_cable_type(info,
                                           MAX8997_CABLE_GROUP_ADC, &attached);