drm/panthor: Preserve the result returned by panthor_fw_resume()
authorBoris Brezillon <boris.brezillon@collabora.com>
Wed, 11 Dec 2024 07:54:15 +0000 (08:54 +0100)
committerBoris Brezillon <boris.brezillon@collabora.com>
Wed, 11 Dec 2024 09:03:50 +0000 (10:03 +0100)
WARN() will return true if the condition is true, false otherwise.
If we store the return of drm_WARN_ON() in ret, we lose the actual
error code.

v3:
- Add R-b
v2:
- Add R-b

Fixes: 5fe909cae118 ("drm/panthor: Add the device logical block")
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Steven Price <steven.price@arm.com>
Reviewed-by: Adrian Larumbe <adrian.larumbe@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241211075419.2333731-2-boris.brezillon@collabora.com
drivers/gpu/drm/panthor/panthor_device.c

index 00f7b8ce935aeded5f5e341b9ed609af3754db50..b3c117d55c2aee751115583dd68015a7ff57da8f 100644 (file)
@@ -465,8 +465,8 @@ int panthor_device_resume(struct device *dev)
            drm_dev_enter(&ptdev->base, &cookie)) {
                panthor_gpu_resume(ptdev);
                panthor_mmu_resume(ptdev);
-               ret = drm_WARN_ON(&ptdev->base, panthor_fw_resume(ptdev));
-               if (!ret) {
+               ret = panthor_fw_resume(ptdev);
+               if (!drm_WARN_ON(&ptdev->base, ret)) {
                        panthor_sched_resume(ptdev);
                } else {
                        panthor_mmu_suspend(ptdev);