Skip to content

Commit 91b5900

Browse files
lumagandersson
authored andcommitted
soc: qcom: ocmem: return -EPROBE_DEFER is ocmem is not available
If OCMEM is declared in DT, it is expected that it is present and handled by the driver. The GPU driver will ignore -ENODEV error, which typically means that OCMEM isn't defined in DT. Let ocmem return -EPROBE_DEFER if it supposed to be used, but it is not probed (yet). Fixes: 88c1e94 ("soc: qcom: add OCMEM driver") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Link: https://lore.kernel.org/r/20260323-ocmem-v1-3-ad9bcae44763@oss.qualcomm.com [bjorn: s/ERR_PTR(dev_err_probe)/dev_err_ptr_probe/ Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 9dfd69c commit 91b5900

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

drivers/soc/qcom/ocmem.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,10 +203,9 @@ struct ocmem *of_get_ocmem(struct device *dev)
203203

204204
ocmem = platform_get_drvdata(pdev);
205205
put_device(&pdev->dev);
206-
if (!ocmem) {
207-
dev_err(dev, "Cannot get ocmem\n");
208-
return ERR_PTR(-ENODEV);
209-
}
206+
if (!ocmem)
207+
return dev_err_ptr_probe(dev, -EPROBE_DEFER, "Cannot get ocmem\n");
208+
210209
return ocmem;
211210
}
212211
EXPORT_SYMBOL_GPL(of_get_ocmem);

0 commit comments

Comments
 (0)