Skip to content

Commit 8cab0e9

Browse files
pchelkin91gregkh
authored andcommitted
usb: chipidea: ci_hdrc_imx: fix call balance of regulator routines
Upon encountering errors during the HSIC pinctrl handling section the regulator should be disabled. Use devm_add_action_or_reset() to let the regulator-disabling routine be handled by device resource management stack. Found by Linux Verification Center (linuxtesting.org). Fixes: 4d61412 ("usb: chipidea: imx: pinctrl for HSIC is optional") Cc: stable <stable@kernel.org> Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru> Acked-by: Peter Chen <peter.chen@kernel.org> Link: https://lore.kernel.org/r/20250316102658.490340-3-pchelkin@ispras.ru Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 4e28f79 commit 8cab0e9

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

drivers/usb/chipidea/ci_hdrc_imx.c

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,13 @@ static int ci_hdrc_imx_notify_event(struct ci_hdrc *ci, unsigned int event)
336336
return ret;
337337
}
338338

339+
static void ci_hdrc_imx_disable_regulator(void *arg)
340+
{
341+
struct ci_hdrc_imx_data *data = arg;
342+
343+
regulator_disable(data->hsic_pad_regulator);
344+
}
345+
339346
static int ci_hdrc_imx_probe(struct platform_device *pdev)
340347
{
341348
struct ci_hdrc_imx_data *data;
@@ -394,6 +401,13 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
394401
"Failed to enable HSIC pad regulator\n");
395402
goto err_put;
396403
}
404+
ret = devm_add_action_or_reset(dev,
405+
ci_hdrc_imx_disable_regulator, data);
406+
if (ret) {
407+
dev_err(dev,
408+
"Failed to add regulator devm action\n");
409+
goto err_put;
410+
}
397411
}
398412
}
399413

@@ -432,11 +446,11 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
432446

433447
ret = imx_get_clks(dev);
434448
if (ret)
435-
goto disable_hsic_regulator;
449+
goto qos_remove_request;
436450

437451
ret = imx_prepare_enable_clks(dev);
438452
if (ret)
439-
goto disable_hsic_regulator;
453+
goto qos_remove_request;
440454

441455
ret = clk_prepare_enable(data->clk_wakeup);
442456
if (ret)
@@ -526,10 +540,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
526540
clk_disable_unprepare(data->clk_wakeup);
527541
err_wakeup_clk:
528542
imx_disable_unprepare_clks(dev);
529-
disable_hsic_regulator:
530-
if (data->hsic_pad_regulator)
531-
/* don't overwrite original ret (cf. EPROBE_DEFER) */
532-
regulator_disable(data->hsic_pad_regulator);
543+
qos_remove_request:
533544
if (pdata.flags & CI_HDRC_PMQOS)
534545
cpu_latency_qos_remove_request(&data->pm_qos_req);
535546
data->ci_pdev = NULL;
@@ -557,8 +568,6 @@ static void ci_hdrc_imx_remove(struct platform_device *pdev)
557568
clk_disable_unprepare(data->clk_wakeup);
558569
if (data->plat_data->flags & CI_HDRC_PMQOS)
559570
cpu_latency_qos_remove_request(&data->pm_qos_req);
560-
if (data->hsic_pad_regulator)
561-
regulator_disable(data->hsic_pad_regulator);
562571
}
563572
if (data->usbmisc_data)
564573
put_device(data->usbmisc_data->dev);

0 commit comments

Comments
 (0)