diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-01-16 23:05:57 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-01-16 23:05:56 -0800 |
| commit | 83874a41c1bba7c5961d9d88f334cbb833baafd7 (patch) | |
| tree | d0ba75197b48dc96796f2f858d18863c7f55af93 | |
| parent | 4b3736890b25b8af6a8468f13ef8a310c7468a92 (diff) | |
| parent | e98aac1d5d40fd9c3de7be578ff96b4db043fd98 (diff) | |
Merge "msm: camera: avoid invalid memory access"
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c b/drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c index ac9a4b2048d1..bc6fb191b3b5 100644 --- a/drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c +++ b/drivers/media/platform/msm/camera_v2/msm_buf_mgr/msm_generic_buf_mgr.c @@ -302,7 +302,7 @@ static void msm_buf_mngr_sd_shutdown(struct msm_buf_mngr_device *dev, pr_info("%s: Delete invalid bufs =%lx, session_id=%u, bufs->ses_id=%d, str_id=%d, idx=%d\n", __func__, (unsigned long)bufs, session->session, bufs->session_id, bufs->stream_id, - bufs->vb2_v4l2_buf->vb2_buf.index); + bufs->index); if (session->session == bufs->session_id) { list_del_init(&bufs->entry); kfree(bufs); |