Commit 42c76c98 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Martin K. Petersen
Browse files

scsi: acornscsi: Fix an error handling path in acornscsi_probe() 

'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: e95a1b65 ("[ARM] rpc: acornscsi: update to new style ecard driver")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent f47c2403

drivers/scsi/arm/acornscsi.c

+3 −1
Original line number Diff line number Diff line
@@ -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;