From bb91a7d96a5c9662f41a08024f405bf9ad333e86 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 9 Jun 2023 07:17:37 +0200 Subject: 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 Signed-off-by: Christoph Hellwig Tested-by: Fabio Estevam Tested-by: Marek Szyprowski Tested-by: Mark Brown Link: https://lore.kernel.org/r/20230609051737.328930-1-hch@lst.de Signed-off-by: Jens Axboe --- block/early-lookup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'block/early-lookup.c') 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 */ if (p < s + 2 || !isdigit(p[-2]) || p[-1] != 'p') -- cgit v1.2.3-70-g09d2