diff options
| author | Dhaval Patel <pdhaval@quicinc.com> | 2016-11-11 12:11:46 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-11 12:11:46 -0800 |
| commit | 57e7b8e0a34af679d5a18a3eaeaef7eaf449b389 (patch) | |
| tree | bda049d4e8abdec7ae42e422caec805c29b9b4b5 /drivers/gpu | |
| parent | 3ba84a7305ec5e8c29dc157c11c3899903b76837 (diff) | |
| parent | 9d05ecd63df4675b865684a298f7b6b72d5ce6f7 (diff) | |
Merge "drm/msm/sde: print error only if catalog property is mandatory" into dev/msm-4.4-drm_kms
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/msm/sde/sde_hw_catalog.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/drivers/gpu/drm/msm/sde/sde_hw_catalog.c b/drivers/gpu/drm/msm/sde/sde_hw_catalog.c index b252b5bd2bce..5460aa32a37e 100644 --- a/drivers/gpu/drm/msm/sde/sde_hw_catalog.c +++ b/drivers/gpu/drm/msm/sde/sde_hw_catalog.c @@ -353,10 +353,15 @@ static int _validate_dt_entry(struct device_node *np, *off_count = of_property_count_u32_elems(np, sde_prop[0].prop_name); if ((*off_count > MAX_BLOCKS) || (*off_count < 0)) { - SDE_ERROR("invalid hw offset prop name:%s count:%d\n", - sde_prop[0].prop_name, *off_count); *off_count = 0; - return sde_prop[0].is_mandatory ? -EINVAL : 0; + + if (sde_prop[0].is_mandatory) { + SDE_ERROR("invalid hw offset prop name:%s count:%d\n", + sde_prop[0].prop_name, *off_count); + rc = -EINVAL; + } + + return rc; } for (i = 0; i < prop_size && i < MAX_BLOCKS; i++) { |