diff options
| author | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-10-07 08:08:24 +0000 |
|---|---|---|
| committer | Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com> | 2020-10-07 08:08:24 +0000 |
| commit | 7cb3d3a7e48532037e26e4fcea154e5260e538b1 (patch) | |
| tree | 424154a929b451e3e3efdbb0a7bb6102a39b566e /drivers/phy | |
| parent | dd0d7d132f105fa3ec8ca68d794fb75d4619cb0f (diff) | |
| parent | d22f99d235e13356521b374410a6ee24f50b65e6 (diff) | |
Merge tag 'v5.4.70' into 5.4-2.1.x-imx
This is the 5.4.70 stable release
Signed-off-by: Andrey Zhizhikin <andrey.zhizhikin@leica-geosystems.com>
Diffstat (limited to 'drivers/phy')
| -rw-r--r-- | drivers/phy/ti/phy-am654-serdes.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/phy/ti/phy-am654-serdes.c b/drivers/phy/ti/phy-am654-serdes.c index 88a047b9fa6f..6ef12017ff4e 100644 --- a/drivers/phy/ti/phy-am654-serdes.c +++ b/drivers/phy/ti/phy-am654-serdes.c @@ -625,8 +625,10 @@ static int serdes_am654_probe(struct platform_device *pdev) pm_runtime_enable(dev); phy = devm_phy_create(dev, NULL, &ops); - if (IS_ERR(phy)) - return PTR_ERR(phy); + if (IS_ERR(phy)) { + ret = PTR_ERR(phy); + goto clk_err; + } phy_set_drvdata(phy, am654_phy); phy_provider = devm_of_phy_provider_register(dev, serdes_am654_xlate); |