Commit 88c31d2d authored by Dan Carpenter's avatar Dan Carpenter Committed by Lucas Stach
Browse files

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: f098f9b8 ("drm/etnaviv: move runtime PM handling to events")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: default avatarLucas Stach <l.stach@pengutronix.de>
parent 9ec2afde

drivers/gpu/drm/etnaviv/etnaviv_gpu.c

+4 −4
Original line number Diff line number Diff line
@@ -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);