Skip to contentSkip to conversation

usb: chipidea: ci_hdrc_imx: Fix error handling when creating IRQ name

PATCH New [email protected] 1 participant 1 message Sep 11

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 usb: chipidea: ci_hdrc_imx: Fix error handling when creating IRQ name

From: bui duc phuc <[email protected]>

devm_kasprintf() can fail when allocating the wakeup IRQ name. In this case, the probe error path should shut down the PHY before returning.

Use the phy_shutdown error path instead of err_clk so that the PHY is properly shut down when creating the IRQ name or requesting the wakeup IRQ fails.

---

Link v2:
https://lore.kernel.org/all/[email protected]/
Link v3:
https://lore.kernel.org/all/[email protected]/

Changes in v3:
- Use the phy_shutdown label instead of err_clk as suggested by Sashiko's review.
- Add Peter Chen's Acked-by tag.
- Add Frank Li's Reviewed-by tag.
Changes in v4:
- Rebased on top of gregkh/usb-testing.
- The ret assignment for dev_err_probe() is already handled by 1db5c6b0b983 ("usb: chipidea: imx: fix missing ret assignment for dev_err_probe").
- Keep this patch focused on the phy_shutdown error path.

 drivers/usb/chipidea/ci_hdrc_imx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/usb/chipidea/ci_hdrc_imx.c +2 -2
index 6a17b22047b3..edbf9df9b8f2 100644
@@ -533,7 +533,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
 		irq_name = devm_kasprintf(dev, GFP_KERNEL, "%s:wakeup", pdata.name);
 		if (!irq_name) {
 			ret = dev_err_probe(dev, -ENOMEM, "failed to create irq_name\n");
-			goto err_clk;
+			goto phy_shutdown;
 		}
 
 		ret = devm_request_threaded_irq(dev, data->wakeup_irq,
@@ -541,7 +541,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev)
 						IRQF_ONESHOT | IRQF_NO_AUTOEN,
 						irq_name, data);
 		if (ret)
-			goto err_clk;
+			goto phy_shutdown;
 	}
 
 	ret = imx_usbmisc_init(data->usbmisc_data);
Signature · 1 line
2.43.0