diff --git a/arch/efi/efi/efi-image.c b/arch/efi/efi/efi-image.c
index c780cad..27f3c1b 100644
--- a/arch/efi/efi/efi-image.c
+++ b/arch/efi/efi/efi-image.c
@@ -130,12 +130,16 @@
 	efi_status_t efiret;
 	struct linux_kernel_header *image_header;
 	const char *options;
+	bool is_driver;
 	int ret;
 
 	ret = efi_load_image(file, &loaded_image, &handle);
 	if (ret)
 		return ret;
 
+	is_driver = (loaded_image->image_code_type == EFI_BOOT_SERVICES_CODE) ||
+		(loaded_image->image_code_type == EFI_RUNTIME_SERVICES_CODE);
+
 	image_header = (struct linux_kernel_header *)loaded_image->image_base;
 	if (image_header->boot_flag == 0xAA55 &&
 	    image_header->header == 0x53726448) {
@@ -152,7 +156,8 @@
 	if (EFI_ERROR(efiret))
 		pr_err("failed to StartImage: %s\n", efi_strerror(efiret));
 
-	BS->unload_image(handle);
+	if (!is_driver)
+		BS->unload_image(handle);
 
 	efi_connect_all();
 	efi_register_devices();