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

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

Merge "soc: qcom: qmi_interface: Limit txn ids to U16_MAX"

parents 4826d527 92ddcb89

drivers/soc/qcom/qmi_interface.c

+1 −1
Original line number Diff line number Diff line
@@ -324,7 +324,7 @@ int qmi_txn_init(struct qmi_handle *qmi, struct qmi_txn *txn, 
	txn->dest = c_struct;



	mutex_lock(&qmi->txn_lock);

	ret = idr_alloc_cyclic(&qmi->txns, txn, 0, INT_MAX, GFP_KERNEL);

	ret = idr_alloc_cyclic(&qmi->txns, txn, 0, U16_MAX, GFP_KERNEL);

	if (ret < 0)

		pr_err("failed to allocate transaction id\n");

include/linux/soc/qcom/qmi.h

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ struct qmi_ops { 
struct qmi_txn {

	struct qmi_handle *qmi;



	int id;

	u16 id;



	struct mutex lock;

	struct completion completion;