Commit 80743b4b authored Oct 29, 2019 by Andrey Grodzovsky Committed by Greg Kroah-Hartman Sep 05, 2020

drm/sched: Fix passing zero to 'PTR_ERR' warning v2



commit d7c5782acd354bdb5ed0fa10e1e397eaed558390 upstream.

Fix a static code checker warning.

v2: Drop PTR_ERR_OR_ZERO.

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Emily Deng <Emily.Deng@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: Walter Lozano <walter.lozano@collabora.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 6cadd1e2

drivers/gpu/drm/scheduler/sched_main.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -496,8 +496,10 @@ void drm_sched_resubmit_jobs(struct drm_gpu_scheduler *sched)
		fence = sched->ops->run_job(s_job);

		if (IS_ERR_OR_NULL(fence)) {
		s_job->s_fence->parent = NULL;
		if (IS_ERR(fence))
		dma_fence_set_error(&s_fence->finished, PTR_ERR(fence));

		s_job->s_fence->parent = NULL;
		} else {
		s_job->s_fence->parent = fence;
		}
		@@ -748,8 +750,9 @@ static int drm_sched_main(void *param)
		r);
		dma_fence_put(fence);
		} else {

		if (IS_ERR(fence))
		dma_fence_set_error(&s_fence->finished, PTR_ERR(fence));

		drm_sched_process_job(NULL, &sched_job->cb);
		}