This is a note to let you know that I've just added the patch titled
pcd: fix error codes in pcd_init_unit()
to the 5.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pcd-fix-error-codes-in-pcd_init_unit.patch
and it can be found in the queue-5.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From d0ac7a30e41174c794fbfa53ea986d9555e5b9f4 Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Date: Fri, 1 Oct 2021 15:26:23 +0300
Subject: pcd: fix error codes in pcd_init_unit()
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
commit d0ac7a30e41174c794fbfa53ea986d9555e5b9f4 upstream.
Return -ENODEV on these error paths instead of returning success.
Fixes: af761f277b7f ("pcd: cleanup initialization")
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20211001122623.GA2283@kili
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/block/paride/pcd.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -613,8 +613,7 @@ static int pcd_identify(struct pcd_unit
}
/*
- * 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 pcd_probe(struct pcd_unit *cd, int ms)
{
@@ -627,7 +626,7 @@ static int pcd_probe(struct pcd_unit *cd
if (!pcd_reset(cd) && !pcd_identify(cd))
return 0;
}
- return -1;
+ return -ENODEV;
}
static int pcd_probe_capabilities(struct pcd_unit *cd)
@@ -933,9 +932,12 @@ static int pcd_init_unit(struct pcd_unit
disk->event_flags = DISK_EVENT_FLAG_BLOCK_ON_EXCL_WRITE;
if (!pi_init(cd->pi, autoprobe, port, mode, unit, protocol, delay,
- pcd_buffer, PI_PCD, verbose, cd->name))
+ pcd_buffer, PI_PCD, verbose, cd->name)) {
+ ret = -ENODEV;
goto out_free_disk;
- if (pcd_probe(cd, ms))
+ }
+ ret = pcd_probe(cd, ms);
+ if (ret)
goto out_pi_release;
cd->present = 1;
Patches currently in stable-queue which might be from dan.carpenter@xxxxxxxxxx are
queue-5.15/pcd-fix-error-codes-in-pcd_init_unit.patch
