[PATCH 1/2] efi: load the protocol expected by the driver

[Michael Olbrich]

The drivers are loaded if any guid provided by the device matches. So load
the protocol for the matched guid and not for the first guid.
Otherwise the driver may cast the protocol to the wrong type and proably
crash.

Signed-off-by: Michael Olbrich <m.olbrich at pengutronix.de>
---
 drivers/efi/efi-device.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/efi/efi-device.c b/drivers/efi/efi-device.c
index 959878e7f5cf..c5fb404cd36b 100644
--- a/drivers/efi/efi-device.c
+++ b/drivers/efi/efi-device.c
@@ -184,8 +184,6 @@ static struct efi_device *efi_add_device(efi_handle_t *handle, efi_guid_t **guid
 	efidev->dev.info = efi_devinfo;
 	efidev->devpath = devpath;
 
-	BS->handle_protocol(handle, &guidarr[0], &efidev->protocol);
-
 	sprintf(efidev->dev.name, "handle-%p", handle);
 
 	efidev->parent_handle = efi_find_parent(efidev->handle);
@@ -311,8 +309,11 @@ static int efi_bus_match(struct device_d *dev, struct driver_d *drv)
 	int i;
 
 	for (i = 0; i < efidev->num_guids; i++) {
-		if (!memcmp(&efidrv->guid, &efidev->guids[i], sizeof(efi_guid_t)))
+		if (!memcmp(&efidrv->guid, &efidev->guids[i], sizeof(efi_guid_t))) {
+			BS->handle_protocol(efidev->handle, &efidev->guids[i],
+					&efidev->protocol);
 			return 0;
+		}
 	}
 
 	return 1;
-- 
2.11.0