From: Dan Carpenter <dan.carpenter@oracle.com>

Date: Fri, 1 Oct 2021 15:27:22 +0300

Subject: [PATCH] sx8: fix an error code in carm_init_one()

Git-commit: 5deae20c552aec0750cc7b95e84ca94121aac3b3

Patch-mainline: v5.16-rc1

References: jsc#PED-1183

Return a negative error code here on this error path instead of

returning success.

Fixes: 637208e74a86 ("block/sx8: add error handling support for add_disk()")

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Link: https://lore.kernel.org/r/20211001122722.GC2283@kili

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Acked-by: Hannes Reinecke <hare@suse.com>

---

 drivers/block/sx8.c | 4 +++-

 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c

index 1c79248c4826..d1676fe0da1a 100644

--- a/drivers/block/sx8.c

+++ b/drivers/block/sx8.c

@@ -1511,8 +1511,10 @@ static int carm_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)

 	DPRINTK("waiting for probe_comp\n");

 	host->probe_err = -ENODEV;

 	wait_for_completion(&host->probe_comp);

-	if (host->probe_err)

+	if (host->probe_err) {

+		rc = host->probe_err;

 		goto err_out_free_irq;

+	}

 	printk(KERN_INFO "%s: pci %s, ports %d, io %llx, irq %u, major %d\n",

 	       host->name, pci_name(pdev), (int) CARM_MAX_PORTS,

-- 

2.35.3