Commit d0ac7a30 authored by Dan Carpenter's avatar Dan Carpenter Committed by Jens Axboe

pcd: fix error codes in pcd_init_unit()

Return -ENODEV on these error paths instead of returning success.

Fixes: af761f27 ("pcd: cleanup initialization")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/20211001122623.GA2283@kiliSigned-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent db8eda9c
...@@ -613,8 +613,7 @@ static int pcd_identify(struct pcd_unit *cd) ...@@ -613,8 +613,7 @@ static int pcd_identify(struct pcd_unit *cd)
} }
/* /*
* returns 0, with id set if drive is detected * returns 0, with id set if drive is detected, otherwise an error code.
* -1, if drive detection failed
*/ */
static int pcd_probe(struct pcd_unit *cd, int ms) static int pcd_probe(struct pcd_unit *cd, int ms)
{ {
...@@ -627,7 +626,7 @@ static int pcd_probe(struct pcd_unit *cd, int ms) ...@@ -627,7 +626,7 @@ static int pcd_probe(struct pcd_unit *cd, int ms)
if (!pcd_reset(cd) && !pcd_identify(cd)) if (!pcd_reset(cd) && !pcd_identify(cd))
return 0; return 0;
} }
return -1; return -ENODEV;
} }
static int pcd_probe_capabilities(struct pcd_unit *cd) static int pcd_probe_capabilities(struct pcd_unit *cd)
...@@ -933,9 +932,12 @@ static int pcd_init_unit(struct pcd_unit *cd, bool autoprobe, int port, ...@@ -933,9 +932,12 @@ static int pcd_init_unit(struct pcd_unit *cd, bool autoprobe, int port,
disk->events = DISK_EVENT_MEDIA_CHANGE; disk->events = DISK_EVENT_MEDIA_CHANGE;
if (!pi_init(cd->pi, autoprobe, port, mode, unit, protocol, delay, 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; goto out_free_disk;
if (pcd_probe(cd, ms)) }
ret = pcd_probe(cd, ms);
if (ret)
goto out_pi_release; goto out_pi_release;
cd->present = 1; cd->present = 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment