diff options
| author | Laurentiu Tudor <laurentiu.tudor@nxp.com> | 2020-11-05 18:30:49 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-30 13:53:45 +0300 |
| commit | 45f8472fa26b31612f143e89f46d7ed5758cd306 (patch) | |
| tree | ca4a7a185c5bbed37106ba08bfbc15a201b37b78 | |
| parent | 096ee6ebd01e81305e6646b27d5ec238cbaa963d (diff) | |
| download | linux-45f8472fa26b31612f143e89f46d7ed5758cd306.tar.xz | |
bus: fsl-mc: add back accidentally dropped error check
[ Upstream commit 61243c03dde238170001093a29716c2369e8358f ]
A previous patch accidentally dropped an error check, so add it back.
Fixes: aef85b56c3c1 ("bus: fsl-mc: MC control registers are not always available")
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Link: https://lore.kernel.org/r/20201105153050.19662-1-laurentiu.tudor@nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/bus/fsl-mc/fsl-mc-bus.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c index 76a6ee505d33..806766b1b45f 100644 --- a/drivers/bus/fsl-mc/fsl-mc-bus.c +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c @@ -967,8 +967,11 @@ static int fsl_mc_bus_probe(struct platform_device *pdev) platform_set_drvdata(pdev, mc); plat_res = platform_get_resource(pdev, IORESOURCE_MEM, 1); - if (plat_res) + if (plat_res) { mc->fsl_mc_regs = devm_ioremap_resource(&pdev->dev, plat_res); + if (IS_ERR(mc->fsl_mc_regs)) + return PTR_ERR(mc->fsl_mc_regs); + } if (mc->fsl_mc_regs && IS_ENABLED(CONFIG_ACPI) && !dev_of_node(&pdev->dev)) { |