From: Srinivas Kandagatla Date: Sun, 16 Sep 2018 23:45:46 +0000 (-0700) Subject: slimbus: ngd: register ngd driver only once. X-Git-Tag: v4.19.85~71 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9874abd5c8786572811517d170ff661476ac4047;p=platform%2Fkernel%2Flinux-rpi.git slimbus: ngd: register ngd driver only once. [ Upstream commit 1830dad34c070161fda2ff1db77b39ffa78aa380 ] Move ngd platform driver out of loop so that it registers only once. Signed-off-by: Srinivas Kandagatla Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- diff --git a/drivers/slimbus/qcom-ngd-ctrl.c b/drivers/slimbus/qcom-ngd-ctrl.c index f63d1b8..a9abde2f 100644 --- a/drivers/slimbus/qcom-ngd-ctrl.c +++ b/drivers/slimbus/qcom-ngd-ctrl.c @@ -1346,7 +1346,6 @@ static int of_qcom_slim_ngd_register(struct device *parent, ngd->base = ctrl->base + ngd->id * data->offset + (ngd->id - 1) * data->size; ctrl->ngd = ngd; - platform_driver_register(&qcom_slim_ngd_driver); return 0; } @@ -1445,6 +1444,7 @@ static int qcom_slim_ngd_ctrl_probe(struct platform_device *pdev) init_completion(&ctrl->reconf); init_completion(&ctrl->qmi.qmi_comp); + platform_driver_register(&qcom_slim_ngd_driver); return of_qcom_slim_ngd_register(dev, ctrl); }