diff options
| author | Sean Paul <seanpaul@chromium.org> | 2019-06-17 16:09:17 -0400 |
|---|---|---|
| committer | Sean Paul <seanpaul@chromium.org> | 2019-06-20 14:41:59 -0400 |
| commit | 7896e2237d034493036b25fc0c674654eeeb4dfa (patch) | |
| tree | 6fa7a70897c1ef6997aa88bbe27df9fdf0f736fa /drivers/gpu/drm/msm/dsi | |
| parent | a93be1fc6c84f09a51bb72f833a39c2dc942bd21 (diff) | |
drm/msm/phy/dsi_phy: Set pll to NULL in case initialization fails
We have if (!phy->pll) checks scattered through the driver and if
phy->pll is an error pointer, those checks will pass and bad things will
happen :(
Reviewed-by: Rob Clark <robdclark@chromium.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190617200920.133104-1-sean@poorly.run
Diffstat (limited to 'drivers/gpu/drm/msm/dsi')
| -rw-r--r-- | drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c index fda73749fcc0..524d4c40c5ce 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c @@ -618,10 +618,12 @@ static int dsi_phy_driver_probe(struct platform_device *pdev) goto fail; phy->pll = msm_dsi_pll_init(pdev, phy->cfg->type, phy->id); - if (IS_ERR_OR_NULL(phy->pll)) + if (IS_ERR_OR_NULL(phy->pll)) { DRM_DEV_INFO(dev, "%s: pll init failed: %ld, need separate pll clk driver\n", __func__, PTR_ERR(phy->pll)); + phy->pll = NULL; + } dsi_phy_disable_resource(phy); |