* [PATCH v2] scsi: fdomain: Fix error return code in fdomain_probe()
@ 2021-07-15 3:26 Wei Li
2021-08-10 3:32 ` Martin K. Petersen
2021-08-17 3:17 ` Martin K. Petersen
0 siblings, 2 replies; 3+ messages in thread
From: Wei Li @ 2021-07-15 3:26 UTC (permalink / raw)
To: James E.J. Bottomley, Martin K. Petersen, Ondrej Zary
Cc: linux-scsi, linux-kernel, huawei.libin
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 <hulkci@huawei.com>
Signed-off-by: Wei Li <liwei391@huawei.com>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] scsi: fdomain: Fix error return code in fdomain_probe()
2021-07-15 3:26 [PATCH v2] scsi: fdomain: Fix error return code in fdomain_probe() Wei Li
@ 2021-08-10 3:32 ` Martin K. Petersen
2021-08-17 3:17 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2021-08-10 3:32 UTC (permalink / raw)
To: Wei Li
Cc: James E.J. Bottomley, Martin K. Petersen, Ondrej Zary,
linux-scsi, linux-kernel, huawei.libin
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] scsi: fdomain: Fix error return code in fdomain_probe()
2021-07-15 3:26 [PATCH v2] scsi: fdomain: Fix error return code in fdomain_probe() Wei Li
2021-08-10 3:32 ` Martin K. Petersen
@ 2021-08-17 3:17 ` Martin K. Petersen
1 sibling, 0 replies; 3+ messages in thread
From: Martin K. Petersen @ 2021-08-17 3:17 UTC (permalink / raw)
To: James E.J. Bottomley, Ondrej Zary, Wei Li
Cc: Martin K . Petersen, huawei.libin, linux-kernel, linux-scsi
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-08-17 3:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-15 3:26 [PATCH v2] scsi: fdomain: Fix error return code in fdomain_probe() Wei Li
2021-08-10 3:32 ` Martin K. Petersen
2021-08-17 3:17 ` Martin K. Petersen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).