From cdb5bcc0598e4c97ecb5e0056578095329fb797f Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Sun, 8 Nov 2020 15:59:55 -0800 Subject: [PATCH] turnip: Fix file descriptor return. Fix defect reported by Coverity Scan. Logically dead code (DEADCODE) dead_error_line: Execution cannot reach the expression -1 inside this statement: return ret ? -1 : handle.fd; Fixes: cec0bc73e55 ("turnip: rework fences to use syncobjs") Signed-off-by: Vinson Lee Reviewed-by: Jonathan Marek Part-of: (cherry picked from commit dad6b625768f2b68e1ea5c31da4e0e1415ef41bb) --- .pick_status.json | 2 +- src/freedreno/vulkan/tu_drm.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 8cb0f675095..f45a9d42634 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -454,7 +454,7 @@ "description": "turnip: Fix file descriptor return.", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "cec0bc73e550859635a71d330625bccdf71e87ee" }, diff --git a/src/freedreno/vulkan/tu_drm.c b/src/freedreno/vulkan/tu_drm.c index 34b337f8e0a..a45cfcda5de 100644 --- a/src/freedreno/vulkan/tu_drm.c +++ b/src/freedreno/vulkan/tu_drm.c @@ -913,8 +913,6 @@ tu_syncobj_to_fd(struct tu_device *device, struct tu_syncobj *sync) int ret; ret = ioctl(device->fd, DRM_IOCTL_SYNCOBJ_HANDLE_TO_FD, &handle); - if (ret) - return 0; return ret ? -1 : handle.fd; }