diff options
| author | Simon Rettberg | 2019-02-15 10:38:39 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2019-02-15 10:38:39 +0100 |
| commit | 893714cfea74a68b5637f1d9866d1b8d8973cf94 (patch) | |
| tree | 0bc3209f0dc939a4dab61218c9af71f904bb17e5 /src/interface | |
| parent | [efi] Add support for console --update in efifb mode (diff) | |
| parent | [init] Show startup and shutdown function names in debug messages (diff) | |
| download | ipxe-893714cfea74a68b5637f1d9866d1b8d8973cf94.tar.gz ipxe-893714cfea74a68b5637f1d9866d1b8d8973cf94.tar.xz ipxe-893714cfea74a68b5637f1d9866d1b8d8973cf94.zip | |
Merge branch 'master' into openslx
Diffstat (limited to 'src/interface')
| -rw-r--r-- | src/interface/efi/efi_snp.c | 6 | ||||
| -rw-r--r-- | src/interface/efi/efi_timer.c | 1 | ||||
| -rw-r--r-- | src/interface/linux/linux_console.c | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/interface/efi/efi_snp.c b/src/interface/efi/efi_snp.c index 9c1b14d87..d648700f6 100644 --- a/src/interface/efi/efi_snp.c +++ b/src/interface/efi/efi_snp.c @@ -1829,12 +1829,12 @@ static int efi_snp_probe ( struct net_device *netdev ) { efi_snp_hii_uninstall ( snpdev ); efi_child_del ( efidev->device, snpdev->handle ); err_efi_child_add: - bs->CloseProtocol ( snpdev->handle, &efi_nii_protocol_guid, - efi_image_handle, snpdev->handle ); - err_open_nii: bs->CloseProtocol ( snpdev->handle, &efi_nii31_protocol_guid, efi_image_handle, snpdev->handle ); err_open_nii31: + bs->CloseProtocol ( snpdev->handle, &efi_nii_protocol_guid, + efi_image_handle, snpdev->handle ); + err_open_nii: bs->UninstallMultipleProtocolInterfaces ( snpdev->handle, &efi_simple_network_protocol_guid, &snpdev->snp, diff --git a/src/interface/efi/efi_timer.c b/src/interface/efi/efi_timer.c index 8fe307ceb..8f40cb81a 100644 --- a/src/interface/efi/efi_timer.c +++ b/src/interface/efi/efi_timer.c @@ -212,6 +212,7 @@ static void efi_tick_shutdown ( int booting __unused ) { /** Timer tick startup function */ struct startup_fn efi_tick_startup_fn __startup_fn ( STARTUP_EARLY ) = { + .name = "efi_tick", .startup = efi_tick_startup, .shutdown = efi_tick_shutdown, }; diff --git a/src/interface/linux/linux_console.c b/src/interface/linux/linux_console.c index 5105eaa94..5294fca79 100644 --- a/src/interface/linux/linux_console.c +++ b/src/interface/linux/linux_console.c @@ -150,6 +150,7 @@ static void linux_console_shutdown(int flags __unused) } struct startup_fn linux_console_startup_fn __startup_fn(STARTUP_EARLY) = { + .name = "linux_console", .startup = linux_console_startup, .shutdown = linux_console_shutdown, }; |