Merge "Revert "drm/msm: Replace PTR_RET with PTR_ERR_OR_ZERO"" (e4748512) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ int msm_dss_get_clk(struct device dev, struct dss_clk clk_arry, int num_clk)

		for (i = 0; i < num_clk; i++) {
		clk_arry[i].clk = clk_get(dev, clk_arry[i].clk_name);
		rc = PTR_ERR_OR_ZERO(clk_arry[i].clk);
		rc = PTR_RET(clk_arry[i].clk);
		if (rc) {
		DEV_ERR("%pS->%s: '%s' get failed. rc=%d\n",
		__builtin_return_address(0), __func__,