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

Commit e908b225 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "wigig_sensing: fix usage of wait_event_interruptible_timeout()"

parents 0efb13a5 c4c4c4f1

drivers/misc/wigig_sensing.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -563,12 +563,14 @@ static int wigig_sensing_ioc_change_mode(struct wigig_sensing_ctx *ctx, 
		pr_err("wait_event_interruptible_timeout() interrupted by a signal (%d)\n",

		pr_err("wait_event_interruptible_timeout() interrupted by a signal (%d)\n",

		       rc);

		       rc);

		goto End;

		goto End;

	}

	} else if (rc == 0) {

	if (rc == 0) {

		/* Timeout, FW did not respond in time */

		/* Timeout, FW did not respond in time */

		pr_err("wait_event_interruptible_timeout() timed out\n");

		pr_err("wait_event_interruptible_timeout() timed out\n");

		rc = -ETIME;

		rc = -ETIME;

		goto End;

		goto End;

	} else {

		/* rc > 0, this is fine, set rc to 0 */

		rc = 0;

	}

	}





	if (ctx->stm.state != ctx->stm.state_request) {

	if (ctx->stm.state != ctx->stm.state_request) {