Merge tag 'driver-core-5.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / slimbus / qcom-ngd-ctrl.c

diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c
index 0f29a08b4c0995166ee201d7e9fe8206efbd2e13..0aa8408464add60cd8564c19d3071d543e9e0436 100644 (file)
--- a/drivers/slimbus/qcom-ngd-ctrl.c
+++ b/drivers/slimbus/qcom-ngd-ctrl.c
@@ -1434,6 +1434,7 @@ static int of_qcom_slim_ngd_register(struct device *parent,
        const struct of_device_id *match;
        struct device_node *node;
        u32 id;
+       int ret;
 
        match = of_match_node(qcom_slim_ngd_dt_match, parent->of_node);
        data = match->data;
@@ -1455,7 +1456,17 @@ static int of_qcom_slim_ngd_register(struct device *parent,
                }
                ngd->id = id;
                ngd->pdev->dev.parent = parent;
-               ngd->pdev->driver_override = QCOM_SLIM_NGD_DRV_NAME;
+
+               ret = driver_set_override(&ngd->pdev->dev,
+                                         &ngd->pdev->driver_override,
+                                         QCOM_SLIM_NGD_DRV_NAME,
+                                         strlen(QCOM_SLIM_NGD_DRV_NAME));
+               if (ret) {
+                       platform_device_put(ngd->pdev);
+                       kfree(ngd);
+                       of_node_put(node);
+                       return ret;
+               }
                ngd->pdev->dev.of_node = node;
                ctrl->ngd = ngd;