summaryrefslogtreecommitdiffstats
path: root/drivers/clk/imx/clk-imx8qxp-lpcg.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-28 08:17:02 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-01-28 08:17:02 +0100
commitd61b5d546af21e886aafcc9182f5ac5935a3177d (patch)
tree448b389768a74efb604dd22ea2a5d43686ea3be5 /drivers/clk/imx/clk-imx8qxp-lpcg.c
parent94832d93992176b7c37672e1fc7b7acc16e70286 (diff)
parentf17b5f06cb92ef2250513a1e154c47b78df07d40 (diff)
Merge 5.0-rc4 into staging-next
We need the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/clk/imx/clk-imx8qxp-lpcg.c')
-rw-r--r--drivers/clk/imx/clk-imx8qxp-lpcg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/imx/clk-imx8qxp-lpcg.c b/drivers/clk/imx/clk-imx8qxp-lpcg.c
index 99c2508de8e5..fb6edf1b8aa2 100644
--- a/drivers/clk/imx/clk-imx8qxp-lpcg.c
+++ b/drivers/clk/imx/clk-imx8qxp-lpcg.c
@@ -169,6 +169,8 @@ static int imx8qxp_lpcg_clk_probe(struct platform_device *pdev)
return -ENODEV;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -EINVAL;
base = devm_ioremap(dev, res->start, resource_size(res));
if (!base)
return -ENOMEM;