| Message ID | 1629992163-6252-1-git-send-email-loic.poulain@linaro.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | qrtr: mhi: Fix duplicate channel start | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/cc_maintainers | warning | 2 maintainers not CCed: mani@kernel.org linux-arm-msm@vger.kernel.org |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 11 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
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.
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(-)