mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
Merge branch 'staging' of ssh://xenbits.xen.org/home/xen/git/xen into staging
This commit is contained in:
Ian Campbell committed
commit
607a67c7f6
1 file changed
+6
-5
@@ -595,11 +595,12 @@ static void __init setup_efi_pci(void)
|
||||
struct efi_pci_rom *last = NULL;
|
||||
|
||||
status = efi_bs->LocateHandle(ByProtocol, &pci_guid, NULL, &size, NULL);
|
||||
if ( status == EFI_BUFFER_TOO_SMALL )
|
||||
status = efi_bs->AllocatePool(EfiLoaderData, size, (void **)&handles);
|
||||
if ( !EFI_ERROR(status) )
|
||||
status = efi_bs->LocateHandle(ByProtocol, &pci_guid, NULL, &size,
|
||||
handles);
|
||||
if ( status != EFI_BUFFER_TOO_SMALL )
|
||||
return;
|
||||
status = efi_bs->AllocatePool(EfiLoaderData, size, (void **)&handles);
|
||||
if ( EFI_ERROR(status) )
|
||||
return;
|
||||
status = efi_bs->LocateHandle(ByProtocol, &pci_guid, NULL, &size, handles);
|
||||
if ( EFI_ERROR(status) )
|
||||
size = 0;
|
||||
|
||||
|
||||