From: Rex Zhu Date: Tue, 10 May 2016 05:39:29 +0000 (+0800) Subject: drm/amd/powerplay: fix NULL point check error X-Git-Tag: v4.7-rc1~29^2~1^2~23 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2dcbffad94f3c2f85cc2c433dad382a741e91dc4;p=karo-tx-linux.git drm/amd/powerplay: fix NULL point check error && was used instead of || Signed-off-by: Rex Zhu Reviewed-by: Alex Deucher Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c index 94b2a73f0151..4115dd8ec051 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c @@ -199,8 +199,9 @@ void phm_apply_dal_min_voltage_request(struct pp_hwmgr *hwmgr) enum PP_DAL_POWERLEVEL dal_power_level = hwmgr->dal_power_level; uint32_t req_vddc = 0, req_volt, i; - if (!table && !(dal_power_level >= PP_DAL_POWERLEVEL_ULTRALOW && - dal_power_level <= PP_DAL_POWERLEVEL_PERFORMANCE)) + if (!table || table-count <= 0 + || dal_power_level < PP_DAL_POWERLEVEL_ULTRALOW + || dal_power_level > PP_DAL_POWERLEVEL_PERFORMANCE) return; for (i = 0; i < table->count; i++) {