diff options
| author | Dan Carpenter <dan.carpenter@linaro.org> | 2023-07-19 13:17:56 +0300 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2023-07-19 13:36:25 +0300 |
| commit | 88c31d2dd191ab78e9ba9ff967845018aa7ee214 (patch) | |
| tree | 70d38ade18ba6d4edc037b38bf1df4363212a617 /drivers/gpu/drm/etnaviv | |
| parent | 9ec2afde83c18e205b6c38335b5e6bedf913ba76 (diff) | |
| download | linux-88c31d2dd191ab78e9ba9ff967845018aa7ee214.tar.xz | |
drm/etnaviv: fix error code in event_alloc()
There are two "ret" variables declared in this function so setting
"ret = -EBUSY;" sets the wrong one. The function ends up returning an
uninitialized variable.
Fixes: f098f9b8042a ("drm/etnaviv: move runtime PM handling to events")
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Diffstat (limited to 'drivers/gpu/drm/etnaviv')
| -rw-r--r-- | drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index f54f12090685..0382cd91eebf 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -1158,18 +1158,18 @@ static int event_alloc(struct etnaviv_gpu *gpu, unsigned nr_events, int ret; for (i = 0; i < nr_events; i++) { - unsigned long ret; + unsigned long remaining; - ret = wait_for_completion_timeout(&gpu->event_free, timeout); + remaining = wait_for_completion_timeout(&gpu->event_free, timeout); - if (!ret) { + if (!remaining) { dev_err(gpu->dev, "wait_for_completion_timeout failed"); ret = -EBUSY; goto out; } acquired++; - timeout = ret; + timeout = remaining; } spin_lock(&gpu->event_spinlock); |