diff options
| author | Trishansh Bhardwaj <tbhardwa@codeaurora.org> | 2016-10-27 10:52:13 +0530 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-07 21:52:55 -0800 |
| commit | 5dab322d1843e1c48e5f2c6c7617521b2dac06ad (patch) | |
| tree | db19bf78009a5f7cacea313cf4f8ea012c8b7f37 /drivers/media | |
| parent | 85d7e134cc5d95dfd3a1a5ee5a1d1435633288cd (diff) | |
msm: camera: Change CID array size to MAX_CID_CH_PARAM_ENTRY
Define new macro MAX_CID_CH_PARAM_ENTRY as 3.
Modify CID array size in msm_ispif_param_entry to
MAX_CID_CH_PARAM_ENTRY.
CRs-Fixed: 1064689
Change-Id: Ibb993839c1057fb62f43e99df3bee8328a4c702f
Signed-off-by: Trishansh Bhardwaj <tbhardwa@codeaurora.org>
Signed-off-by: Junzhe Zou <jnzhezou@codeaurora.org>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c | 4 |
1 files changed, 2 insertions, 2 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 df95e5cb9b99..094a7861831a 100644 --- a/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c +++ b/drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c @@ -840,7 +840,7 @@ static uint16_t msm_ispif_get_cids_mask_from_cfg( uint16_t cids_mask = 0; BUG_ON(!entry); - for (i = 0; i < entry->num_cids; i++) + for (i = 0; i < entry->num_cids && i < MAX_CID_CH_PARAM_ENTRY; i++) cids_mask |= (1 << entry->cids[i]); return cids_mask; @@ -970,7 +970,7 @@ static void msm_ispif_intf_cmd(struct ispif_device *ispif, uint32_t cmd_bits, pr_err("%s: invalid interface type\n", __func__); return; } - if (params->entries[i].num_cids > MAX_CID_CH) { + if (params->entries[i].num_cids > MAX_CID_CH_PARAM_ENTRY) { pr_err("%s: out of range of cid_num %d\n", __func__, params->entries[i].num_cids); return; |