From 551d5dd108310c2a4c553756434df28c22366a8e Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Thu, 10 Oct 2019 12:48:57 -0700 Subject: [PATCH] soc: qcom: scm: Fix SCM device initialization Ensure that the SCM device is set only if dma_set_mask() occurs successfully. Change-Id: I98d305dbee85313dc328ecf74aff3dfeea98f838 Signed-off-by: Isaac J. Manjarres --- drivers/soc/qcom/scm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/soc/qcom/scm.c b/drivers/soc/qcom/scm.c index 5f7508f471b4..c647e2002bb9 100644 --- a/drivers/soc/qcom/scm.c +++ b/drivers/soc/qcom/scm.c @@ -595,11 +595,11 @@ static int qcom_scm_probe(struct platform_device *pdev) return -ENODEV; } - qcom_scm_dev = &pdev->dev; - #ifdef CONFIG_ARM64 ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); #endif + if (!ret) + qcom_scm_dev = &pdev->dev; return ret; }