summaryrefslogtreecommitdiffstats
path: root/net/qrtr/mhi.c
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-08-18 21:17:10 -0700
committerJakub Kicinski <kuba@kernel.org>2022-08-18 21:17:10 -0700
commit268603d79cc48dba671e9caf108fab32315b86a2 (patch)
tree77466c8c4c104397d1c459674f7a75c4fd60455a /net/qrtr/mhi.c
parent8c78c1e52b0b86bd282c41f3725beabe3c244b94 (diff)
parent4c2d0b039c5cc0112206a5b22431b577cb1c57ad (diff)
downloadlinux-268603d79cc48dba671e9caf108fab32315b86a2.tar.bz2
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts. Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/qrtr/mhi.c')
-rw-r--r--net/qrtr/mhi.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/net/qrtr/mhi.c b/net/qrtr/mhi.c
index 18196e1c8c2f..9ced13c0627a 100644
--- a/net/qrtr/mhi.c
+++ b/net/qrtr/mhi.c
@@ -78,11 +78,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_autoqueue(mhi_dev);
- if (rc)
- return rc;
-
qdev = devm_kzalloc(&mhi_dev->dev, sizeof(*qdev), GFP_KERNEL);
if (!qdev)
return -ENOMEM;
@@ -96,6 +91,13 @@ static int qcom_mhi_qrtr_probe(struct mhi_device *mhi_dev,
if (rc)
return rc;
+ /* start channels */
+ rc = mhi_prepare_for_transfer_autoqueue(mhi_dev);
+ if (rc) {
+ qrtr_endpoint_unregister(&qdev->ep);
+ return rc;
+ }
+
dev_dbg(qdev->dev, "Qualcomm MHI QRTR driver probed\n");
return 0;