drm/msm/a6xx: Check for ERR or NULL before iounmap

[ Upstream commit 5ca4a094ba7e1369363dcbcbde8baf06ddcdc2d1 ]

pdcptr and seqptr aren't necessarily valid, check them before trying to
unmap them.

Changes in v2:
- None

Cc: Jordan Crouse <jcrouse@codeaurora.org>
Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190523171653.138678-3-sean@poorly.run
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
index 38e2cfa9cec797f41fc6ca173c3140a9b95564ec..418bb08bbed7f6a8bddf741441a6e9c0cd81347f 100644 (file)
--- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
+++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c
@@ -504,8 +504,10 @@ static void a6xx_gmu_rpmh_init(struct a6xx_gmu *gmu)
        wmb();
 
 err:
-       devm_iounmap(gmu->dev, pdcptr);
-       devm_iounmap(gmu->dev, seqptr);
+       if (!IS_ERR_OR_NULL(pdcptr))
+               devm_iounmap(gmu->dev, pdcptr);
+       if (!IS_ERR_OR_NULL(seqptr))
+               devm_iounmap(gmu->dev, seqptr);
 }
 
 /*