| From 52f227cdb8b9189393858dce44b566b4d4c74603 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 8 Jun 2021 13:10:31 +0300 |
| Subject: extcon: extcon-max8997: Fix IRQ freeing at error path |
| |
| From: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com> |
| |
| [ 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 | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/extcon/extcon-max8997.c b/drivers/extcon/extcon-max8997.c |
| index 337b0eea4e62..5c4f7746cbee 100644 |
| --- a/drivers/extcon/extcon-max8997.c |
| +++ b/drivers/extcon/extcon-max8997.c |
| @@ -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); |
| -- |
| 2.30.2 |
| |
