[PATCH] qrtr: mhi: Fix duplicate channel start

Loic Poulain loic.poulain at linaro.org
Thu Aug 26 08:36:03 PDT 2021


commit ce78ffa3ef16 ("net: really fix the build...") handling a merge
conflict causes the mhi_prepare_for_transfer() function to be called
twice (with different flags), leading to QRTR probing issues.

Fixes: ce78ffa3ef16 ("net: really fix the build...")
Signed-off-by: Loic Poulain <loic.poulain at linaro.org>
---
 net/qrtr/mhi.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/net/qrtr/mhi.c b/net/qrtr/mhi.c
index 1dc955c..deb8b03 100644
--- a/net/qrtr/mhi.c
+++ b/net/qrtr/mhi.c
@@ -83,11 +83,6 @@ static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev,
 	struct qrtr_mhi_dev *qdev;
 	int rc;
 
-	/* start channels */
-	rc = mhi_prepare_for_transfer(mhi_dev, 0);
-	if (rc)
-		return rc;
-
 	qdev = devm_kzalloc(&mhi_dev->dev, sizeof(*qdev), GFP_KERNEL);
 	if (!qdev)
 		return -ENOMEM;
-- 
2.7.4




More information about the ath11k mailing list