diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-06 21:33:04 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-06 21:33:04 -0700 |
| commit | 412bca522f20f7fc16ed88b62f1a1eb594635395 (patch) | |
| tree | fd1b4a32880b31e9c09d4b08b0c798c8baf8689d | |
| parent | e5f02a0e835507186336476b1cf6806ab7c29037 (diff) | |
| parent | d5a915cb036da1cec740cbab12ce78c91dfb769d (diff) | |
Merge "msm: camera: isp: Avoid information leak in ISPIF"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c | 2 |
1 files changed, 1 insertions, 1 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 24e3223a79d0..ab7d4e86dcac 100644 --- a/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c +++ b/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c @@ -621,7 +621,7 @@ static int msm_ispif_reset(struct ispif_device *ispif) ispif->base + ISPIF_VFE_m_INTF_CMD_0(i)); msm_camera_io_w(ISPIF_STOP_INTF_IMMEDIATELY, ispif->base + ISPIF_VFE_m_INTF_CMD_1(i)); - pr_debug("%s: base %lx", __func__, (unsigned long)ispif->base); + pr_debug("%s: base %pK", __func__, ispif->base); msm_camera_io_w(0, ispif->base + ISPIF_VFE_m_PIX_INTF_n_CID_MASK(i, 0)); msm_camera_io_w(0, ispif->base + |