diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/efi_client/efi.c | 6 | ||||
| -rw-r--r-- | lib/efi_driver/efi_block_device.c | 8 | ||||
| -rw-r--r-- | lib/efi_driver/efi_uclass.c | 2 | ||||
| -rw-r--r-- | lib/efi_loader/efi_net.c | 2 |
4 files changed, 7 insertions, 11 deletions
diff --git a/lib/efi_client/efi.c b/lib/efi_client/efi.c index bcb34d67465..a3a40b5549d 100644 --- a/lib/efi_client/efi.c +++ b/lib/efi_client/efi.c @@ -155,7 +155,7 @@ int efi_store_memory_map(struct efi_priv *priv) putc(' '); printhex2(ret); puts(" No memory map\n"); - return ret; + return -EFAULT; } /* * Since doing a malloc() may change the memory map and also we want to @@ -168,7 +168,7 @@ int efi_store_memory_map(struct efi_priv *priv) if (!priv->memmap_desc) { printhex2(ret); puts(" No memory for memory descriptor\n"); - return ret; + return -EFAULT; } ret = boot->get_memory_map(&priv->memmap_size, priv->memmap_desc, @@ -177,7 +177,7 @@ int efi_store_memory_map(struct efi_priv *priv) if (ret) { printhex2(ret); puts(" Can't get memory map\n"); - return ret; + return -EFAULT; } return 0; diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index 070747de515..9ab956c7ef7 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -84,7 +84,7 @@ static ulong efi_bl_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt, * efi_bl_write() - write to block device * * @dev: device - * @blknr: first block to be write + * @blknr: first block to write * @blkcnt: number of blocks to write * @buffer: input buffer * Return: number of blocks transferred @@ -124,7 +124,7 @@ efi_bl_create_block_device(efi_handle_t handle, void *interface) efi_status_t ret; int r; int devnum; - char *name; + char name[18]; /* strlen("efiblk#2147483648") + 1 */ struct efi_block_io *io = interface; struct efi_blk_plat *plat; @@ -136,9 +136,6 @@ efi_bl_create_block_device(efi_handle_t handle, void *interface) if (devnum < 0) return EFI_OUT_OF_RESOURCES; - name = calloc(1, 18); /* strlen("efiblk#2147483648") + 1 */ - if (!name) - return EFI_OUT_OF_RESOURCES; sprintf(name, "efiblk#%d", devnum); /* Create driver model udevice for the EFI block io device */ @@ -146,7 +143,6 @@ efi_bl_create_block_device(efi_handle_t handle, void *interface) devnum, io->media->block_size, (lbaint_t)io->media->last_block, &bdev)) { ret = EFI_OUT_OF_RESOURCES; - free(name); goto err; } diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c index 7392c60f0f9..bd46c9f5539 100644 --- a/lib/efi_driver/efi_uclass.c +++ b/lib/efi_driver/efi_uclass.c @@ -227,7 +227,7 @@ static efi_status_t EFIAPI efi_uc_stop( goto out; } ret = EFI_SUCCESS; - goto out; + goto out; } /* Destroy all children */ diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c index b8a6e08ba8e..0f8a851e3f2 100644 --- a/lib/efi_loader/efi_net.c +++ b/lib/efi_loader/efi_net.c @@ -372,7 +372,7 @@ out: } /* - * efi_net_receive_filters() - mange multicast receive filters + * efi_net_receive_filters() - manage multicast receive filters * * This function implements the ReceiveFilters service of the * EFI_SIMPLE_NETWORK_PROTOCOL. See the Unified Extensible Firmware Interface |