Commit b371fd13 authored by Dan Carpenter's avatar Dan Carpenter Committed by Karol Herbst

drm/nouveau/acr: fix a couple NULL vs IS_ERR() checks

The nvkm_acr_lsfw_add() function never returns NULL.  It returns error
pointers on error.

Fixes: 22dcda45 ("drm/nouveau/acr: implement new subdev to replace "secure boot"")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarKarol Herbst <kherbst@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20211118111314.GB1147@kili
parent 46741e4f
...@@ -207,11 +207,13 @@ int ...@@ -207,11 +207,13 @@ int
gm200_acr_wpr_parse(struct nvkm_acr *acr) gm200_acr_wpr_parse(struct nvkm_acr *acr)
{ {
const struct wpr_header *hdr = (void *)acr->wpr_fw->data; const struct wpr_header *hdr = (void *)acr->wpr_fw->data;
struct nvkm_acr_lsfw *lsfw;
while (hdr->falcon_id != WPR_HEADER_V0_FALCON_ID_INVALID) { while (hdr->falcon_id != WPR_HEADER_V0_FALCON_ID_INVALID) {
wpr_header_dump(&acr->subdev, hdr); wpr_header_dump(&acr->subdev, hdr);
if (!nvkm_acr_lsfw_add(NULL, acr, NULL, (hdr++)->falcon_id)) lsfw = nvkm_acr_lsfw_add(NULL, acr, NULL, (hdr++)->falcon_id);
return -ENOMEM; if (IS_ERR(lsfw))
return PTR_ERR(lsfw);
} }
return 0; return 0;
......
...@@ -161,11 +161,13 @@ int ...@@ -161,11 +161,13 @@ int
gp102_acr_wpr_parse(struct nvkm_acr *acr) gp102_acr_wpr_parse(struct nvkm_acr *acr)
{ {
const struct wpr_header_v1 *hdr = (void *)acr->wpr_fw->data; const struct wpr_header_v1 *hdr = (void *)acr->wpr_fw->data;
struct nvkm_acr_lsfw *lsfw;
while (hdr->falcon_id != WPR_HEADER_V1_FALCON_ID_INVALID) { while (hdr->falcon_id != WPR_HEADER_V1_FALCON_ID_INVALID) {
wpr_header_v1_dump(&acr->subdev, hdr); wpr_header_v1_dump(&acr->subdev, hdr);
if (!nvkm_acr_lsfw_add(NULL, acr, NULL, (hdr++)->falcon_id)) lsfw = nvkm_acr_lsfw_add(NULL, acr, NULL, (hdr++)->falcon_id);
return -ENOMEM; if (IS_ERR(lsfw))
return PTR_ERR(lsfw);
} }
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment