Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea02b848 authored by Srinivas Kandagatla's avatar Srinivas Kandagatla Committed by Greg Kroah-Hartman
Browse files

slimbus: ngd: get drvdata from correct device 



[ Upstream commit b58c663059b484f7ff547d076a34cf6d7a302e56 ]

Get drvdata directly from parent instead of ngd dev, as ngd
dev can probe defer and previously set drvdata will become null.

Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200417093618.7929-1-srinivas.kandagatla@linaro.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 229e1646

drivers/slimbus/qcom-ngd-ctrl.c

+2 −2
Original line number Diff line number Diff line
@@ -1350,7 +1350,6 @@ static int of_qcom_slim_ngd_register(struct device *parent, 
		ngd->pdev->driver_override = QCOM_SLIM_NGD_DRV_NAME;

		ngd->pdev->dev.of_node = node;

		ctrl->ngd = ngd;

		platform_set_drvdata(ngd->pdev, ctrl);



		platform_device_add(ngd->pdev);

		ngd->base = ctrl->base + ngd->id * data->offset +
@@ -1365,12 +1364,13 @@ static int of_qcom_slim_ngd_register(struct device *parent, 


static int qcom_slim_ngd_probe(struct platform_device *pdev)

{

	struct qcom_slim_ngd_ctrl *ctrl = platform_get_drvdata(pdev);

	struct device *dev = &pdev->dev;

	struct qcom_slim_ngd_ctrl *ctrl = dev_get_drvdata(dev->parent);

	int ret;



	ctrl->ctrl.dev = dev;



	platform_set_drvdata(pdev, ctrl);

	pm_runtime_use_autosuspend(dev);

	pm_runtime_set_autosuspend_delay(dev, QCOM_SLIM_NGD_AUTOSUSPEND);

	pm_runtime_set_suspended(dev);