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

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

Merge "soc: qcom: spcom: return EINTR on wait interrupted"

parents 1cbaaa15 737fd071

drivers/soc/qcom/spcom.c

+3 −5
Original line number Diff line number Diff line
@@ -476,11 +476,9 @@ static int spcom_rx(struct spcom_channel *ch, 
			spcom_pr_warn("rpmsg channel is closing\n");

			ret = -ERESTART;

			goto exit_err;

		} else if (ret < 0 || timeleft == -ERESTARTSYS) {

			spcom_pr_dbg("wait interrupted: ret=%d, timeleft=%ld\n",

				 ret, timeleft);

			if (timeleft == -ERESTARTSYS)

				ret = -ERESTARTSYS;

		} else if (ret < 0 || timeleft < 0) {

			spcom_pr_err("rx wait was interrupted!");

			ret = -EINTR; /* abort, not restartable */

			goto exit_err;

		} else if (ch->actual_rx_size) {

			spcom_pr_dbg("actual_rx_size is [%zu], txn_id %d\n",