diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-10 22:49:33 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-10 22:49:33 -0800 |
| commit | e0181c29c332bf498aa0a660f57b95fd73e221d9 (patch) | |
| tree | 46e9bb0a488ed9683e673ff3ef4f0d3c86fa36b5 /include | |
| parent | 90bc693dd39ad162c42abc5f8e295a1afa6d75e3 (diff) | |
| parent | 5dab322d1843e1c48e5f2c6c7617521b2dac06ad (diff) | |
Merge "msm: camera: Change CID array size to MAX_CID_CH_PARAM_ENTRY"
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/media/msmb_ispif.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/media/msmb_ispif.h b/include/uapi/media/msmb_ispif.h index 7f4deaf12683..3720056aa28d 100644 --- a/include/uapi/media/msmb_ispif.h +++ b/include/uapi/media/msmb_ispif.h @@ -28,6 +28,7 @@ enum msm_ispif_intftype { }; #define MAX_PARAM_ENTRIES (INTF_MAX * 2) #define MAX_CID_CH 8 +#define MAX_CID_CH_PARAM_ENTRY 3 #define PIX0_MASK (1 << PIX0) #define PIX1_MASK (1 << PIX1) @@ -94,7 +95,7 @@ struct msm_ispif_params_entry { enum msm_ispif_vfe_intf vfe_intf; enum msm_ispif_intftype intftype; int num_cids; - enum msm_ispif_cid cids[3]; + enum msm_ispif_cid cids[MAX_CID_CH_PARAM_ENTRY]; enum msm_ispif_csid csid; int crop_enable; uint16_t crop_start_pixel; |