diff options
author | Tom Rini <trini@konsulko.com> | 2018-01-28 18:26:00 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-01-28 18:26:00 -0500 |
commit | bd39d86420434eb8139a111c2582366bc90e65c6 (patch) | |
tree | 072fe6ff300a984a8867c9d2506ed7906d435b2d /lib/vsprintf.c | |
parent | f2ee91501892d3280a4c58093ad3a18dccd0b562 (diff) | |
parent | 29a8a2828e5c6f3f167a8526a80da992b4626daf (diff) |
Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot
Patch queue for efi - 2018-01-28
This is the second part of patches for 2018.03-rc1, fixing
a few minor issues and adding a readme file for iSCSI booting.
Diffstat (limited to 'lib/vsprintf.c')
-rw-r--r-- | lib/vsprintf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 226f4eb3e5..5f7a5f17dc 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -300,8 +300,9 @@ static char *device_path_string(char *buf, char *end, void *dp, int field_width, { u16 *str; + /* If dp == NULL output the string '<NULL>' */ if (!dp) - return "<NULL>"; + return string16(buf, end, dp, field_width, precision, flags); str = efi_dp_str((struct efi_device_path *)dp); if (!str) |