Skip to content
Snippets Groups Projects
Commit 27b5d54f authored by Sebastian Reichel's avatar Sebastian Reichel
Browse files

phy: rockchip: phy-rockchip-csi2-dphy: fix probe error handling


Fix incorrect error rewriting, so that -EPROBE_DEFER is correctly
handled. This fixes the following problem:

rockchip-csi2-dphy csi2-dphy0: failed to get mipi dcphy: -517
rockchip-csi2-dphy csi2-dphy0: probe with driver rockchip-csi2-dphy failed with error -22

Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent f4233d23
No related branches found
No related tags found
No related merge requests found
...@@ -1107,11 +1107,9 @@ static int rockchip_csi2_dphy_get_samsung_phy_hw(struct csi2_dphy *dphy) ...@@ -1107,11 +1107,9 @@ static int rockchip_csi2_dphy_get_samsung_phy_hw(struct csi2_dphy *dphy)
for (i = 0; i < dphy->drv_data->num_samsung_phy; i++) { for (i = 0; i < dphy->drv_data->num_samsung_phy; i++) {
sprintf(phy_name, "dcphy%d", i); sprintf(phy_name, "dcphy%d", i);
dcphy = devm_phy_optional_get(dev, phy_name); dcphy = devm_phy_optional_get(dev, phy_name);
if (IS_ERR(dcphy)) { ret = PTR_ERR_OR_ZERO(dcphy);
ret = PTR_ERR(dcphy); if (ret)
dev_err(dphy->dev, "failed to get mipi dcphy: %d\n", ret); return dev_err_probe(dphy->dev, ret, "failed to get mipi dcphy%d\n", i);
return ret;
}
dcphy_hw = phy_get_drvdata(dcphy); dcphy_hw = phy_get_drvdata(dcphy);
dphy->samsung_phy_group[i] = dcphy_hw; dphy->samsung_phy_group[i] = dcphy_hw;
} }
...@@ -1191,7 +1189,7 @@ static int rockchip_csi2_dphy_probe(struct platform_device *pdev) ...@@ -1191,7 +1189,7 @@ static int rockchip_csi2_dphy_probe(struct platform_device *pdev)
ret = rockchip_csi2_dphy_get_hw(csi2dphy); ret = rockchip_csi2_dphy_get_hw(csi2dphy);
if (ret) if (ret)
return -EINVAL; return ret;
if (csi2dphy->drv_data->chip_id == CHIP_ID_RK3568 || if (csi2dphy->drv_data->chip_id == CHIP_ID_RK3568 ||
csi2dphy->drv_data->chip_id == CHIP_ID_RV1106) { csi2dphy->drv_data->chip_id == CHIP_ID_RV1106) {
csi2dphy->csi_info.csi_num = 1; csi2dphy->csi_info.csi_num = 1;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment