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>

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index f54f120906853a01452dc735cc5de711f65b273d..0382cd91eebf9c026b2e2e3ff6b2f3c470ddd432 100644 (file)
--- 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);