diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-07-01 13:59:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-07-01 13:59:29 +0200 |
| commit | f7697db8b1b3e80d8cd5af071a5af42c8b445fc4 (patch) | |
| tree | 865ae21d27e900063d75ead2e56857edecfc8e43 /drivers/usb/musb | |
| parent | 2ea6d07efe5388d47afdb49079423334c97fe22b (diff) | |
| parent | 22a40d14b572deb80c0648557f4bd502d7e83826 (diff) | |
| download | linux-f7697db8b1b3e80d8cd5af071a5af42c8b445fc4.tar.gz linux-f7697db8b1b3e80d8cd5af071a5af42c8b445fc4.tar.bz2 linux-f7697db8b1b3e80d8cd5af071a5af42c8b445fc4.zip | |
Merge 6.10-rc6 into usb-next
We need the USB fixes in here as well for some follow-on patches.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/musb')
| -rw-r--r-- | drivers/usb/musb/da8xx.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c index fcf06dcf2d61..953094c1930c 100644 --- a/drivers/usb/musb/da8xx.c +++ b/drivers/usb/musb/da8xx.c @@ -560,7 +560,7 @@ static int da8xx_probe(struct platform_device *pdev) ret = of_platform_populate(pdev->dev.of_node, NULL, da8xx_auxdata_lookup, &pdev->dev); if (ret) - return ret; + goto err_unregister_phy; pinfo = da8xx_dev_info; pinfo.parent = &pdev->dev; @@ -575,9 +575,13 @@ static int da8xx_probe(struct platform_device *pdev) ret = PTR_ERR_OR_ZERO(glue->musb); if (ret) { dev_err(&pdev->dev, "failed to register musb device: %d\n", ret); - usb_phy_generic_unregister(glue->usb_phy); + goto err_unregister_phy; } + return 0; + +err_unregister_phy: + usb_phy_generic_unregister(glue->usb_phy); return ret; } |