From 7dfdf9a42072fdb7949e142017721f65e5eeacec Mon Sep 17 00:00:00 2001 From: Jayant Shekhar Date: Thu, 23 Mar 2017 15:46:50 +0530 Subject: [PATCH] msm: mdss: Validate destination scaler based on count If destination scaler count value is 0, don't parse destination scaler structure in validate IOCTL. Change-Id: Ie65b7b0b304108990406e25db55ee841f9316e17 Signed-off-by: Jayant Shekhar --- drivers/video/fbdev/msm/mdss_mdp_layer.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/video/fbdev/msm/mdss_mdp_layer.c b/drivers/video/fbdev/msm/mdss_mdp_layer.c index fce667a2126d..92b95b93462b 100644 --- a/drivers/video/fbdev/msm/mdss_mdp_layer.c +++ b/drivers/video/fbdev/msm/mdss_mdp_layer.c @@ -2595,9 +2595,10 @@ static int __validate_layers(struct msm_fb_data_type *mfd, } ds_data = commit->dest_scaler; - if (test_bit(MDSS_CAPS_DEST_SCALER, mdata->mdss_caps_map) && - ds_data && (ds_data->flags & MDP_DESTSCALER_ENABLE) && - commit->dest_scaler_cnt) { + + if (test_bit(MDSS_CAPS_DEST_SCALER, mdata->mdss_caps_map) + && ds_data && commit->dest_scaler_cnt + && (ds_data->flags & MDP_DESTSCALER_ENABLE)) { /* * Find out which DS block to use based on DS commit info