diff options
| author | Dave Airlie <airlied@redhat.com> | 2022-01-28 07:52:34 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2022-01-28 07:52:41 +0300 |
| commit | 52fa904e5167fc10f4e421727e898ee96c307518 (patch) | |
| tree | af063e43ad449960090774e1a6b739af8fd920ff /drivers/gpu/drm/msm/dsi/dsi.c | |
| parent | 2fd0e5fb4ba37dff344b7bed5176212c2d6a7063 (diff) | |
| parent | 6aa89ae1fb049614b7e03e24485bbfb96754a02b (diff) | |
| download | linux-52fa904e5167fc10f4e421727e898ee96c307518.tar.xz | |
Merge tag 'drm-msm-fixes-2022-01-25' of https://gitlab.freedesktop.org/drm/msm into drm-fixes
A few msm fixes.
- parameter checks
- put_device balancing
- idle/suspend fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Rob Clark <robdclark@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CAF6AEGvAfsgtr==VM4wixAC_hSTuV=eNWXxX=BhZqQrbxHjKgg@mail.gmail.com
Diffstat (limited to 'drivers/gpu/drm/msm/dsi/dsi.c')
| -rw-r--r-- | drivers/gpu/drm/msm/dsi/dsi.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 052548883d27..0fe02529b5e7 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -40,7 +40,12 @@ static int dsi_get_phy(struct msm_dsi *msm_dsi) of_node_put(phy_node); - if (!phy_pdev || !msm_dsi->phy) { + if (!phy_pdev) { + DRM_DEV_ERROR(&pdev->dev, "%s: phy driver is not ready\n", __func__); + return -EPROBE_DEFER; + } + if (!msm_dsi->phy) { + put_device(&phy_pdev->dev); DRM_DEV_ERROR(&pdev->dev, "%s: phy driver is not ready\n", __func__); return -EPROBE_DEFER; } |