Skip to content

Commit 87004ab

Browse files
committed
Revert "drm/amdgpu: Fix NULL dereference in dpm sysfs handlers"
This regressed some working configurations so revert it. Will fix this properly for 5.9 and backport then. This reverts commit 38e0c89. Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected]
1 parent fde9f39 commit 87004ab

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -778,7 +778,8 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev,
778778
tmp_str++;
779779
while (isspace(*++tmp_str));
780780

781-
while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) {
781+
while (tmp_str[0]) {
782+
sub_str = strsep(&tmp_str, delimiter);
782783
ret = kstrtol(sub_str, 0, &parameter[parameter_size]);
783784
if (ret)
784785
return -EINVAL;
@@ -1038,7 +1039,8 @@ static ssize_t amdgpu_read_mask(const char *buf, size_t count, uint32_t *mask)
10381039
memcpy(buf_cpy, buf, bytes);
10391040
buf_cpy[bytes] = '\0';
10401041
tmp = buf_cpy;
1041-
while ((sub_str = strsep(&tmp, delimiter)) != NULL) {
1042+
while (tmp[0]) {
1043+
sub_str = strsep(&tmp, delimiter);
10421044
if (strlen(sub_str)) {
10431045
ret = kstrtol(sub_str, 0, &level);
10441046
if (ret)
@@ -1635,7 +1637,8 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev,
16351637
i++;
16361638
memcpy(buf_cpy, buf, count-i);
16371639
tmp_str = buf_cpy;
1638-
while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) {
1640+
while (tmp_str[0]) {
1641+
sub_str = strsep(&tmp_str, delimiter);
16391642
ret = kstrtol(sub_str, 0, &parameter[parameter_size]);
16401643
if (ret)
16411644
return -EINVAL;

0 commit comments

Comments
 (0)