lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 383/717] bus: fsl-mc: add back accidentally dropped error check
    Date
    From: Laurentiu Tudor <laurentiu.tudor@nxp.com>

    [ 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>
    ---
    drivers/bus/fsl-mc/fsl-mc-bus.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
    index 76a6ee505d33d..806766b1b45f6 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)) {
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:40    [W:2.640 / U:0.912 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site