diff options
| author | Maxime Ripard <maxime@cerno.tech> | 2021-03-16 11:06:23 +0300 |
|---|---|---|
| committer | Maxime Ripard <maxime@cerno.tech> | 2021-03-16 11:06:23 +0300 |
| commit | f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5 (patch) | |
| tree | 474c8fb8df9797b6e0d1e562b389f575c24afc50 /drivers/soc/qcom/ocmem.c | |
| parent | ccf953d8f3d68e85e577e843fdcde8872b0a9769 (diff) | |
| parent | 51c3b916a4d7e24b4918925965867fdd9bd8dd59 (diff) | |
| download | linux-f8bade6c9a6213c2c5ba6e5bf32415ecab6e41e5.tar.xz | |
Merge drm/drm-next into drm-misc-next
Noralf needs some patches in 5.12-rc3, and we've been delaying the 5.12
merge due to the swap issue so it looks like a good time.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Diffstat (limited to 'drivers/soc/qcom/ocmem.c')
| -rw-r--r-- | drivers/soc/qcom/ocmem.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/soc/qcom/ocmem.c b/drivers/soc/qcom/ocmem.c index 7f9e9944d1ea..f1875dc31ae2 100644 --- a/drivers/soc/qcom/ocmem.c +++ b/drivers/soc/qcom/ocmem.c @@ -189,6 +189,7 @@ struct ocmem *of_get_ocmem(struct device *dev) { struct platform_device *pdev; struct device_node *devnode; + struct ocmem *ocmem; devnode = of_parse_phandle(dev->of_node, "sram", 0); if (!devnode || !devnode->parent) { @@ -202,7 +203,12 @@ struct ocmem *of_get_ocmem(struct device *dev) return ERR_PTR(-EPROBE_DEFER); } - return platform_get_drvdata(pdev); + ocmem = platform_get_drvdata(pdev); + if (!ocmem) { + dev_err(dev, "Cannot get ocmem\n"); + return ERR_PTR(-ENODEV); + } + return ocmem; } EXPORT_SYMBOL(of_get_ocmem); |