diff --git a/lib/lmb.c b/lib/lmb.c
index ca00047f6242..745410a88954 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -752,8 +752,6 @@ static int _lmb_alloc_addr(phys_addr_t base, phys_size_t size, u32 flags)
 				      base + size - 1, 1))
 			/* ok, reserve the memory */
 			return lmb_reserve(base, size, flags);
-
-		return -EINVAL;
 	}
 
 	return -EFAULT;
diff --git a/test/lib/lmb.c b/test/lib/lmb.c
index 168c66ae6499..e6c05a492dfd 100644
--- a/test/lib/lmb.c
+++ b/test/lib/lmb.c
@@ -781,9 +781,9 @@ static int test_alloc_addr(struct unit_test_state *uts, const phys_addr_t ram)
 		ret = lmb_alloc_addr(ram_end, 1, LMB_NONE);
 		ut_asserteq(ret, -EFAULT);
 		ret = lmb_alloc_addr(ram_end - 1, 2, LMB_NOMAP);
-		ut_asserteq(ret, -EINVAL);
+		ut_asserteq(ret, -EFAULT);
 		ret = lmb_alloc_addr(ram_end - 1, 2, LMB_NOOVERWRITE);
-		ut_asserteq(ret, -EINVAL);
+		ut_asserteq(ret, -EFAULT);
 	}
 	if (ram != 0) {
 		ret = lmb_alloc_addr(ram - 1, 1, LMB_NONE);