2021-07-15 03:28:28

by liwei (GF)

Subject: [PATCH v2] scsi: fdomain: Fix error return code in fdomain_probe()

When it fail to request_region, it just jump to 'fail_disable',
while the 'ret' is not updated. So assign the return code before
that.

Fixes: 8674a8aa2c39 ("scsi: fdomain: Add PCMCIA support")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Wei Li <[email protected]>
---
drivers/scsi/pcmcia/fdomain_cs.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/pcmcia/fdomain_cs.c b/drivers/scsi/pcmcia/fdomain_cs.c
index e42acf314d06..33df6a9ba9b5 100644
--- a/drivers/scsi/pcmcia/fdomain_cs.c
+++ b/drivers/scsi/pcmcia/fdomain_cs.c
@@ -45,8 +45,10 @@ static int fdomain_probe(struct pcmcia_device *link)
goto fail_disable;

if (!request_region(link->resource[0]->start, FDOMAIN_REGION_SIZE,
- "fdomain_cs"))
+ "fdomain_cs")) {
+ ret = -EBUSY;
goto fail_disable;
+ }

sh = fdomain_create(link->resource[0]->start, link->irq, 7, &link->dev);
if (!sh) {
--
2.25.1

2021-08-10 08:09:36

by Martin K. Petersen

Subject: Re: [PATCH v2] scsi: fdomain: Fix error return code in fdomain_probe()

Wei,

> When it fail to request_region, it just jump to 'fail_disable', while
> the 'ret' is not updated. So assign the return code before that.

Applied to 5.15/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2021-08-17 03:23:07

by Martin K. Petersen

Subject: Re: [PATCH v2] scsi: fdomain: Fix error return code in fdomain_probe()

On Thu, 15 Jul 2021 11:26:25 +0800, Wei Li wrote:

> When it fail to request_region, it just jump to 'fail_disable',
> while the 'ret' is not updated. So assign the return code before
> that.
>
>
>
>
> [...]

Applied to 5.15/scsi-queue, thanks!

[1/1] scsi: fdomain: Fix error return code in fdomain_probe()
https://git.kernel.org/mkp/scsi/c/632c4ae6da1d

--
Martin K. Petersen Oracle Linux Engineering