Lee Duncan c475b7
From: Wei Li <liwei391@huawei.com>
Lee Duncan c475b7
Date: Thu, 15 Jul 2021 11:26:25 +0800
Lee Duncan c475b7
Subject: scsi: fdomain: Fix error return code in fdomain_probe()
Lee Duncan c475b7
Git-commit: 632c4ae6da1d629eddf9da1e692d7617c568c256
Lee Duncan c475b7
Patch-mainline: v5.15-rc1
Lee Duncan c475b7
References: git-fixes
Lee Duncan c475b7
Lee Duncan c475b7
If request_region() fails the return value is not set. Return -EBUSY on
Lee Duncan c475b7
error.
Lee Duncan c475b7
Lee Duncan c475b7
Link: https://lore.kernel.org/r/20210715032625.1395495-1-liwei391@huawei.com
Lee Duncan c475b7
Fixes: 8674a8aa2c39 ("scsi: fdomain: Add PCMCIA support")
Lee Duncan c475b7
Reported-by: Hulk Robot <hulkci@huawei.com>
Lee Duncan c475b7
Signed-off-by: Wei Li <liwei391@huawei.com>
Lee Duncan c475b7
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Lee Duncan c475b7
Acked-by: Lee Duncan <lduncan@suse.com>
Lee Duncan c475b7
---
Lee Duncan c475b7
 drivers/scsi/pcmcia/fdomain_cs.c | 4 +++-
Lee Duncan c475b7
 1 file changed, 3 insertions(+), 1 deletion(-)
Lee Duncan c475b7
Lee Duncan c475b7
diff --git a/drivers/scsi/pcmcia/fdomain_cs.c b/drivers/scsi/pcmcia/fdomain_cs.c
Lee Duncan c475b7
index e42acf314d06..33df6a9ba9b5 100644
Lee Duncan c475b7
--- a/drivers/scsi/pcmcia/fdomain_cs.c
Lee Duncan c475b7
+++ b/drivers/scsi/pcmcia/fdomain_cs.c
Lee Duncan c475b7
@@ -45,8 +45,10 @@ static int fdomain_probe(struct pcmcia_device *link)
Lee Duncan c475b7
 		goto fail_disable;
Lee Duncan c475b7
 
Lee Duncan c475b7
 	if (!request_region(link->resource[0]->start, FDOMAIN_REGION_SIZE,
Lee Duncan c475b7
-			    "fdomain_cs"))
Lee Duncan c475b7
+			    "fdomain_cs")) {
Lee Duncan c475b7
+		ret = -EBUSY;
Lee Duncan c475b7
 		goto fail_disable;
Lee Duncan c475b7
+	}
Lee Duncan c475b7
 
Lee Duncan c475b7
 	sh = fdomain_create(link->resource[0]->start, link->irq, 7, &link->dev);
Lee Duncan c475b7
 	if (!sh) {
Lee Duncan c475b7