lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.7 364/477] scsi: acornscsi: Fix an error handling path in acornscsi_probe()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 42c76c9848e13dbe0538d7ae0147a269dfa859cb ]

    'ret' is known to be 0 at this point. Explicitly return -ENOMEM if one of
    the 'ecardm_iomap()' calls fail.

    Link: https://lore.kernel.org/r/20200530081622.577888-1-christophe.jaillet@wanadoo.fr
    Fixes: e95a1b656a98 ("[ARM] rpc: acornscsi: update to new style ecard driver")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/arm/acornscsi.c | 4 +++-
    1 file changed, 3 insertions(+), 1 deletion(-)

    diff --git a/drivers/scsi/arm/acornscsi.c b/drivers/scsi/arm/acornscsi.c
    index ddb52e7ba6226..9a912fd0f70b5 100644
    --- a/drivers/scsi/arm/acornscsi.c
    +++ b/drivers/scsi/arm/acornscsi.c
    @@ -2911,8 +2911,10 @@ static int acornscsi_probe(struct expansion_card *ec, const struct ecard_id *id)

    ashost->base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
    ashost->fast = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
    - if (!ashost->base || !ashost->fast)
    + if (!ashost->base || !ashost->fast) {
    + ret = -ENOMEM;
    goto out_put;
    + }

    host->irq = ec->irq;
    ashost->host = host;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 23:29    [W:6.898 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site