summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-07-18 11:51:42 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-07-18 11:51:41 -0700
commitcd8e767d7730ccc28b306951b3524ed03d0545cd (patch)
treeb75828a59f754b7b7df2286a6708bd195f8d2787
parentae8ba0547c1c7f61592ec8c1c34ff8f41d010b5e (diff)
parentb1d4d653cc1d7e11d9f3492d923e49dede152a00 (diff)
Merge "msm: ais: fix crash during dumping io register"
-rw-r--r--drivers/media/platform/msm/ais/ispif/msm_ispif.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/ais/ispif/msm_ispif.c b/drivers/media/platform/msm/ais/ispif/msm_ispif.c
index 8eb88364a2cb..c41f4546da5f 100644
--- a/drivers/media/platform/msm/ais/ispif/msm_ispif.c
+++ b/drivers/media/platform/msm/ais/ispif/msm_ispif.c
@@ -69,6 +69,11 @@ static void msm_ispif_io_dump_reg(struct ispif_device *ispif)
{
if (!ispif->enb_dump_reg)
return;
+ if (!ispif->base) {
+ pr_err("%s: null pointer for the ispif base\n", __func__);
+ return;
+ }
+
msm_camera_io_dump(ispif->base, 0x250, 0);
}