| Message ID | 1629992163-6252-1-git-send-email-loic.poulain@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | qrtr: mhi: Fix duplicate channel start | expand |
Loic Poulain <loic.poulain@linaro.org> writes: > 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> Thanks for the patch, but with this patch the whole kernel crashes. I tested on a NUC box with QCA6390 using v5.14-rc7. Unfortunately no netconsole at the moment as I'm moving my workstations. -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
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;
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(-) -- 2.7.4