From: Loic Poulain <loic.poulain@linaro.org> To: kuba@kernel.org, kvalo@codeaurora.org, davem@davemloft.net Cc: netdev@vger.kernel.org, ath11k@lists.infradead.org, regressions@lists.linux.dev, hemantk@codeaurora.org, nschichan@freebox.fr, manivannan.sadhasivam@linaro.org, Loic Poulain <loic.poulain@linaro.org> Subject: [PATCH] qrtr: mhi: Fix duplicate channel start Date: Thu, 26 Aug 2021 17:36:03 +0200 [thread overview] Message-ID: <1629992163-6252-1-git-send-email-loic.poulain@linaro.org> (raw) 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@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
WARNING: multiple messages have this Message-ID (diff)
From: Loic Poulain <loic.poulain@linaro.org> To: kuba@kernel.org, kvalo@codeaurora.org, davem@davemloft.net Cc: netdev@vger.kernel.org, ath11k@lists.infradead.org, regressions@lists.linux.dev, hemantk@codeaurora.org, nschichan@freebox.fr, manivannan.sadhasivam@linaro.org, Loic Poulain <loic.poulain@linaro.org> Subject: [PATCH] qrtr: mhi: Fix duplicate channel start Date: Thu, 26 Aug 2021 17:36:03 +0200 [thread overview] Message-ID: <1629992163-6252-1-git-send-email-loic.poulain@linaro.org> (raw) 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@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 -- ath11k mailing list ath11k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath11k
next reply other threads:[~2021-08-26 15:25 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-08-26 15:36 Loic Poulain [this message] 2021-08-26 15:36 ` [PATCH] qrtr: mhi: Fix duplicate channel start Loic Poulain 2021-08-26 16:34 ` Kalle Valo 2021-08-26 16:34 ` Kalle Valo 2021-08-26 16:34 ` Kalle Valo
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1629992163-6252-1-git-send-email-loic.poulain@linaro.org \ --to=loic.poulain@linaro.org \ --cc=ath11k@lists.infradead.org \ --cc=davem@davemloft.net \ --cc=hemantk@codeaurora.org \ --cc=kuba@kernel.org \ --cc=kvalo@codeaurora.org \ --cc=manivannan.sadhasivam@linaro.org \ --cc=netdev@vger.kernel.org \ --cc=nschichan@freebox.fr \ --cc=regressions@lists.linux.dev \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.