* [PATCH] pf: fix error codes in pf_init_unit()
@ 2021-10-01 12:26 Dan Carpenter
2021-10-01 19:34 ` Jens Axboe
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2021-10-01 12:26 UTC (permalink / raw)
To: Tim Waugh, Christoph Hellwig; +Cc: Jens Axboe, linux-block, kernel-janitors
Return a negative error code instead of success on these error paths.
Fixes: 327638dec0ce ("pf: cleanup initialization")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/block/paride/pf.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index 380d80e507c7..bf8d0ef41a0a 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -651,9 +651,9 @@ static int pf_identify(struct pf_unit *pf)
return 0;
}
-/* returns 0, with id set if drive is detected
- -1, if drive detection failed
-*/
+/*
+ * returns 0, with id set if drive is detected, otherwise an error code.
+ */
static int pf_probe(struct pf_unit *pf)
{
if (pf->drive == -1) {
@@ -675,7 +675,7 @@ static int pf_probe(struct pf_unit *pf)
if (!pf_identify(pf))
return 0;
}
- return -1;
+ return -ENODEV;
}
/* The i/o request engine */
@@ -957,9 +957,12 @@ static int __init pf_init_unit(struct pf_unit *pf, bool autoprobe, int port,
snprintf(pf->name, PF_NAMELEN, "%s%d", name, disk->first_minor);
if (!pi_init(pf->pi, autoprobe, port, mode, unit, protocol, delay,
- pf_scratch, PI_PF, verbose, pf->name))
+ pf_scratch, PI_PF, verbose, pf->name)) {
+ ret = -ENODEV;
goto out_free_disk;
- if (pf_probe(pf))
+ }
+ ret = pf_probe(pf);
+ if (ret)
goto out_pi_release;
ret = add_disk(disk);
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] pf: fix error codes in pf_init_unit()
2021-10-01 12:26 [PATCH] pf: fix error codes in pf_init_unit() Dan Carpenter
@ 2021-10-01 19:34 ` Jens Axboe
0 siblings, 0 replies; 2+ messages in thread
From: Jens Axboe @ 2021-10-01 19:34 UTC (permalink / raw)
To: Dan Carpenter, Tim Waugh, Christoph Hellwig; +Cc: linux-block, kernel-janitors
On 10/1/21 6:26 AM, Dan Carpenter wrote:
> Return a negative error code instead of success on these error paths.
Applied, thanks.
--
Jens Axboe
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-01 19:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-01 12:26 [PATCH] pf: fix error codes in pf_init_unit() Dan Carpenter
2021-10-01 19:34 ` Jens Axboe
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).