aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2016-07-01 17:18:59 -0400
committerAndy Gross <andy.gross@linaro.org>2016-08-23 16:46:32 -0400
commit951a5af92276f5b2f1b8834bd5eef96d8788f66b (patch)
treea6e53b354877fd2c6c3c1339eb8a2c4acacd40ba
parent29b4817d4018df78086157ea3a55c1d9424a7cfc (diff)
soc: qcom: smem: Silence probe defer error
If we fail to get the hwspinlock due to probe defer, we shouldn't print an error message. Just be silent in this case. Cc: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Andy Gross <andy.gross@linaro.org>
-rw-r--r--drivers/soc/qcom/smem.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/soc/qcom/smem.c b/drivers/soc/qcom/smem.c
index 2e1aa9f130f4..18ec52f2078a 100644
--- a/drivers/soc/qcom/smem.c
+++ b/drivers/soc/qcom/smem.c
@@ -740,7 +740,8 @@ static int qcom_smem_probe(struct platform_device *pdev)
740 740
741 hwlock_id = of_hwspin_lock_get_id(pdev->dev.of_node, 0); 741 hwlock_id = of_hwspin_lock_get_id(pdev->dev.of_node, 0);
742 if (hwlock_id < 0) { 742 if (hwlock_id < 0) {
743 dev_err(&pdev->dev, "failed to retrieve hwlock\n"); 743 if (hwlock_id != -EPROBE_DEFER)
744 dev_err(&pdev->dev, "failed to retrieve hwlock\n");
744 return hwlock_id; 745 return hwlock_id;
745 } 746 }
746 747