Merge "msm: kgsl: Fix cx-ipeak victim registration error handling" (b7f12626) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/gpu/msm/kgsl_pwrctrl.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -446,7 +446,7 @@ static int kgsl_pwrctrl_cx_ipeak_init(struct kgsl_device *device)
		if (IS_ERR_OR_NULL(pwr->cx_ipeak_pwr_limit)) {
		dev_err(device->dev,
		"Failed to get cx_ipeak power limit\n");
		of_node_put(child);
		ret = -EINVAL;
		goto error;
		}

		@@ -456,13 +456,14 @@ static int kgsl_pwrctrl_cx_ipeak_init(struct kgsl_device *device)
		kgsl_pwr_cx_ipeak_freq_limit,
		pwr->cx_ipeak_pwr_limit);
		if (ret) {
		kgsl_pwr_limits_del(pwr->cx_ipeak_pwr_limit);
		if (ret != -ENOENT) {
		dev_err(device->dev,
		"Failed to register GPU-CX-Ipeak victim\n");
		kgsl_pwr_limits_del(pwr->cx_ipeak_pwr_limit);
		of_node_put(child);
		goto error;
		}
		}
		}

		of_node_put(node);
		return 0;