summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-07-04 10:05:29 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-07-04 10:05:28 -0700
commit1c7cda658f36a7ab67763259827b3a85a365187f (patch)
treef20f6c94753206e2ef90108026cd0f213a1038c2 /drivers
parenta9194dae5a3aeff0342ba0b1f2f1c1c9c4d8a7fe (diff)
parent95824e6e542d2d273af75c6b1428d233982101c1 (diff)
Merge "msm: ispif: fix crash during dumping io register"
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c b/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
index ab981f762dd2..3f900ded090a 100644
--- a/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
+++ b/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c
@@ -86,6 +86,12 @@ 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);
}