diff options
| author | Alexandre Courbot <[email protected]> | 2017-03-15 14:44:34 +0900 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2017-03-17 10:08:24 +1000 |
| commit | aa7fc0ca759eb25eea6dc0fee4373e5883a17498 (patch) | |
| tree | 28e38930e2446e3a9e201a2e0bd5b30a4be3768f | |
| parent | 9c233760a65cec0c98df7b62bc5185d8889e5fc7 (diff) | |
drm/nouveau/secboot: fix inconsistent pointer checking
We were returning PTR_ERR() on a NULL pointer, which obviously won't
work. nvkm_engine_ref() will return an error in case something went
wrong.
Signed-off-by: Alexandre Courbot <[email protected]>
Reported-by: Dan Carpenter <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c index 8570c84c8a29..f3b3c66349d2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c @@ -59,7 +59,8 @@ gp102_run_secure_scrub(struct nvkm_secboot *sb) nvkm_debug(subdev, "running VPR scrubber binary on NVDEC...\n"); - if (!(engine = nvkm_engine_ref(&device->nvdec->engine))) + engine = nvkm_engine_ref(&device->nvdec->engine); + if (IS_ERR(engine)) return PTR_ERR(engine); falcon = device->nvdec->falcon; |