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

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

Merge "soc: qcom: spcom: fix error code check to resend packet to the peer"

parents 7bc35b1b b3cb0b43

drivers/soc/qcom/spcom.c

+10 −3
Original line number Diff line number Diff line
@@ -649,7 +649,10 @@ static int spcom_handle_send_command(struct spcom_channel *ch, 
		mutex_unlock(&ch->lock);

		msleep(TX_RETRY_DELAY_MSEC);

		mutex_lock(&ch->lock);

	} while (ret == -EAGAIN && time_msec < timeout_msec);

	} while ((ret == -EBUSY || ret == -EAGAIN) && time_msec < timeout_msec);

	if (ret)

		pr_err("ch [%s] rpmsg_trysend() error (%d), timeout_msec=%d\n",

		       ch->name, ret, timeout_msec);

	mutex_unlock(&ch->lock);



	kfree(tx_buf);
@@ -853,7 +856,11 @@ static int spcom_handle_send_modified_command(struct spcom_channel *ch, 
		mutex_unlock(&ch->lock);

		msleep(TX_RETRY_DELAY_MSEC);

		mutex_lock(&ch->lock);

	} while (ret == -EAGAIN && time_msec < timeout_msec);

	} while ((ret == -EBUSY || ret == -EAGAIN) && time_msec < timeout_msec);

	if (ret)

		pr_err("ch [%s] rpmsg_trysend() error (%d), timeout_msec=%d\n",

		       ch->name, ret, timeout_msec);



	mutex_unlock(&ch->lock);

	memset(tx_buf, 0, tx_buf_size);

	kfree(tx_buf);
@@ -1425,7 +1432,7 @@ static ssize_t spcom_device_write(struct file *filp, 
	if (ret) {

		pr_err("handle command error [%d].\n", ret);

		kfree(buf);

		return -EFAULT;

		return ret;

	}



	kfree(buf);