Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7afce51 authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by Greg Kroah-Hartman
Browse files

staging: bcm2835-camera: fix timeout handling in wait_for_completion_timeout 



wait_for_completion_timeout returns unsigned long not int so a variable of
proper type is introduced. Further the check for <= 0 is ambiguous and should
be == 0 here indicating timeout which is the only error case so no additional
check needed here.

Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Fixes: 7b3ad5ab ("staging: Import the BCM2835 MMAL-based V4L2 camera driver.")
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ef5c960

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c

+6 −5
Original line number Diff line number Diff line
@@ -630,6 +630,7 @@ static int send_synchronous_mmal_msg(struct vchiq_mmal_instance *instance, 
{

	struct mmal_msg_context *msg_context;

	int ret;

	unsigned long timeout;



	/* payload size must not cause message to exceed max size */

	if (payload_len >
@@ -668,10 +669,10 @@ static int send_synchronous_mmal_msg(struct vchiq_mmal_instance *instance, 
		return ret;

	}



	ret = wait_for_completion_timeout(&msg_context->u.sync.cmplt, 3 * HZ);

	if (ret <= 0) {

		pr_err("error %d waiting for sync completion\n", ret);

		if (ret == 0)

	timeout = wait_for_completion_timeout(&msg_context->u.sync.cmplt,

					      3 * HZ);

	if (timeout == 0) {

		pr_err("timed out waiting for sync completion\n");

		ret = -ETIME;

		/* todo: what happens if the message arrives after aborting */

		release_msg_context(msg_context);