| Message ID | 1430759036-17827-1-git-send-email-fabf@skynet.be (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/drivers/gpu/drm/msm/dsi/dsi_phy.c b/drivers/gpu/drm/msm/dsi/dsi_phy.c index f0cea89..61af193 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_phy.c +++ b/drivers/gpu/drm/msm/dsi/dsi_phy.c @@ -300,12 +300,12 @@ struct msm_dsi_phy *msm_dsi_phy_init(struct platform_device *pdev, return NULL; phy->base = msm_ioremap(pdev, "dsi_phy", "DSI_PHY"); - if (IS_ERR_OR_NULL(phy->base)) { + if (IS_ERR(phy->base)) { pr_err("%s: failed to map phy base\n", __func__); return NULL; } phy->reg_base = msm_ioremap(pdev, "dsi_phy_regulator", "DSI_PHY_REG"); - if (IS_ERR_OR_NULL(phy->reg_base)) { + if (IS_ERR(phy->reg_base)) { pr_err("%s: failed to map phy regulator base\n", __func__); return NULL; }
msm_ioremap() never returns NULL. There's no need for IS_ERR_OR_NULL() Signed-off-by: Fabian Frederick <fabf@skynet.be> --- drivers/gpu/drm/msm/dsi/dsi_phy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)