diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 08:04:46 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-11-29 08:04:46 +0100 |
| commit | 4d012040161cba054208555300d9fdf2b8925c34 (patch) | |
| tree | 326f597177a377bc17b98e5e77d242a0ba4b042c /drivers/usb/chipidea | |
| parent | c4bc515d73b5201d30f78b935accdd9e3988f05e (diff) | |
| parent | d58071a8a76d779eedab38033ae4c821c30295a5 (diff) | |
| download | lwn-4d012040161cba054208555300d9fdf2b8925c34.tar.gz lwn-4d012040161cba054208555300d9fdf2b8925c34.zip | |
Merge 5.16-rc3 into usb-next
We need the USB driver fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/chipidea')
| -rw-r--r-- | drivers/usb/chipidea/ci_hdrc_imx.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c index f1d100671ee6..097142ffb184 100644 --- a/drivers/usb/chipidea/ci_hdrc_imx.c +++ b/drivers/usb/chipidea/ci_hdrc_imx.c @@ -420,15 +420,15 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) data->phy = devm_usb_get_phy_by_phandle(dev, "fsl,usbphy", 0); if (IS_ERR(data->phy)) { ret = PTR_ERR(data->phy); - if (ret == -ENODEV) { - data->phy = devm_usb_get_phy_by_phandle(dev, "phys", 0); - if (IS_ERR(data->phy)) { - ret = PTR_ERR(data->phy); - if (ret == -ENODEV) - data->phy = NULL; - else - goto err_clk; - } + if (ret != -ENODEV) + goto err_clk; + data->phy = devm_usb_get_phy_by_phandle(dev, "phys", 0); + if (IS_ERR(data->phy)) { + ret = PTR_ERR(data->phy); + if (ret == -ENODEV) + data->phy = NULL; + else + goto err_clk; } } |