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

This commit is contained in:
qctecmdr 2020-03-21 18:35:33 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3d41a73b02

View file

@ -502,11 +502,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",