aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRex Zhu <Rex.Zhu@amd.com>2016-05-10 01:39:29 -0400
committerAlex Deucher <alexander.deucher@amd.com>2016-05-13 14:26:11 -0400
commit2dcbffad94f3c2f85cc2c433dad382a741e91dc4 (patch)
tree9b5209780f7a2afba3dc4abbf888ccb82a9b766a
parent9ab9cf058a5de590146fdc67bf9c483c8bdcbffa (diff)
drm/amd/powerplay: fix NULL point check error
&& was used instead of || Signed-off-by: Rex Zhu <Rex.Zhu@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r--drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c5
1 files changed, 3 insertions, 2 deletions
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)
199 enum PP_DAL_POWERLEVEL dal_power_level = hwmgr->dal_power_level; 199 enum PP_DAL_POWERLEVEL dal_power_level = hwmgr->dal_power_level;
200 uint32_t req_vddc = 0, req_volt, i; 200 uint32_t req_vddc = 0, req_volt, i;
201 201
202 if (!table && !(dal_power_level >= PP_DAL_POWERLEVEL_ULTRALOW && 202 if (!table || table-count <= 0
203 dal_power_level <= PP_DAL_POWERLEVEL_PERFORMANCE)) 203 || dal_power_level < PP_DAL_POWERLEVEL_ULTRALOW
204 || dal_power_level > PP_DAL_POWERLEVEL_PERFORMANCE)
204 return; 205 return;
205 206
206 for (i = 0; i < table->count; i++) { 207 for (i = 0; i < table->count; i++) {