diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c
index 3ad7706472cf1ba78c3fa98f3108ebee8a64f599..7f8970496f5b6414e93c30cee49fb3f71590cefd 100644
--- a/lib/efi_loader/efi_disk.c
+++ b/lib/efi_loader/efi_disk.c
@@ -266,9 +266,9 @@ int efi_disk_register(void)
 #ifdef CONFIG_BLK
 	struct udevice *dev;
 
-	for (uclass_first_device(UCLASS_BLK, &dev);
+	for (uclass_first_device_check(UCLASS_BLK, &dev);
 	     dev;
-	     uclass_next_device(&dev)) {
+	     uclass_next_device_check(&dev)) {
 		struct blk_desc *desc = dev_get_uclass_platdata(dev);
 		const char *if_typename = dev->driver->name;