Skip to content

Commit 154b45b

Browse files
Ben SkeggsAlexGhiti
authored andcommitted
drm/nouveau/fifo: return ERR_PTR from nvkm_runl_new()
Callers expect this - not NULL. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Reviewed-by: Karol Herbst <kherbst@redhat.com> Reviewed-by: Lyude Paul <lyude@redhat.com> Signed-off-by: Karol Herbst <kherbst@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20230525003106.3853741-6-skeggsb@gmail.com
1 parent 3feeafa commit 154b45b

File tree

1 file changed

+2
-2
lines changed
  • drivers/gpu/drm/nouveau/nvkm/engine/fifo

1 file changed

+2
-2
lines changed

drivers/gpu/drm/nouveau/nvkm/engine/fifo/runl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ nvkm_runl_new(struct nvkm_fifo *fifo, int runi, u32 addr, int id_nr)
399399
int ret;
400400

401401
if (!(runl = kzalloc(sizeof(*runl), GFP_KERNEL)))
402-
return NULL;
402+
return ERR_PTR(-ENOMEM);
403403

404404
runl->func = fifo->func->runl;
405405
runl->fifo = fifo;
@@ -419,7 +419,7 @@ nvkm_runl_new(struct nvkm_fifo *fifo, int runi, u32 addr, int id_nr)
419419
(ret = nvkm_chid_new(&nvkm_chan_event, subdev, id_nr, 0, id_nr, &runl->chid))) {
420420
RUNL_ERROR(runl, "cgid/chid: %d", ret);
421421
nvkm_runl_del(runl);
422-
return NULL;
422+
return ERR_PTR(ret);
423423
}
424424
} else {
425425
runl->cgid = nvkm_chid_ref(fifo->cgid);

0 commit comments

Comments
 (0)