Commit ce7c1d04 authored by Evan Quan's avatar Evan Quan Committed by Alex Deucher
Browse files

Revert "Revert "drm/amdgpu: Fix NULL dereference in dpm sysfs handlers"" 



This reverts commit 2456c290. Got lost
during code rebase/merge. No need to port this to other branches.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent cd63989e

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

+3 −6
Original line number Diff line number Diff line
@@ -824,8 +824,7 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, 
		tmp_str++;

	while (isspace(*++tmp_str));



	while (tmp_str[0]) {

		sub_str = strsep(&tmp_str, delimiter);

	while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) {

		ret = kstrtol(sub_str, 0, &parameter[parameter_size]);

		if (ret)

			return -EINVAL;
@@ -1107,8 +1106,7 @@ static ssize_t amdgpu_read_mask(const char *buf, size_t count, uint32_t *mask) 
	memcpy(buf_cpy, buf, bytes);

	buf_cpy[bytes] = '\0';

	tmp = buf_cpy;

	while (tmp[0]) {

		sub_str = strsep(&tmp, delimiter);

	while ((sub_str = strsep(&tmp, delimiter)) != NULL) {

		if (strlen(sub_str)) {

			ret = kstrtol(sub_str, 0, &level);

			if (ret)
@@ -1869,8 +1867,7 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev, 
			i++;

		memcpy(buf_cpy, buf, count-i);

		tmp_str = buf_cpy;

		while (tmp_str[0]) {

			sub_str = strsep(&tmp_str, delimiter);

		while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) {

			ret = kstrtol(sub_str, 0, &parameter[parameter_size]);

			if (ret)

				return -EINVAL;