aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Hellwig <[email protected]>2023-06-09 07:17:37 +0200
committerJens Axboe <[email protected]>2023-06-09 11:38:10 -0600
commitbb91a7d96a5c9662f41a08024f405bf9ad333e86 (patch)
treeb6b4e2cacefa65f7d6c85f418d1f2dd448f1fce6
parent7da15fb0318f18398feea2848d099a8d0d7b5965 (diff)
block: fix rootwait= again
The previous rootwait fix added an -EINVAL return to a completely bogus superflous branch, fix this. Fixes: 1341c7d2ccf4 ("block: fix rootwait=") Reported-by: Mark Brown <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]> Tested-by: Fabio Estevam <[email protected]> Tested-by: Marek Szyprowski <[email protected]> Tested-by: Mark Brown <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
-rw-r--r--block/early-lookup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/early-lookup.c b/block/early-lookup.c
index 48ea3e982419..a5be3c68ed07 100644
--- a/block/early-lookup.c
+++ b/block/early-lookup.c
@@ -181,7 +181,7 @@ static int __init devt_from_devname(const char *name, dev_t *devt)
*p = '\0';
*devt = blk_lookup_devt(s, part);
if (*devt)
- return -ENODEV;
+ return 0;
/* try disk name without p<part number> */
if (p < s + 2 || !isdigit(p[-2]) || p[-1] != 'p')