diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-03 14:13:44 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-03 14:13:44 +0200 |
| commit | 875aabf52e21f84cb6700a760dc734c260c54e7e (patch) | |
| tree | 6c5b012dc066ef584cd5ba31fab1b7381db08281 /lib/vsprintf.c | |
| parent | c0bc126f97fb929b3ae02c1c62322645d70eb408 (diff) | |
| parent | 87085ff2e90ecfa91f8bb0cb0ce19ea661bd6f83 (diff) | |
| download | linux-875aabf52e21f84cb6700a760dc734c260c54e7e.tar.gz linux-875aabf52e21f84cb6700a760dc734c260c54e7e.tar.bz2 linux-875aabf52e21f84cb6700a760dc734c260c54e7e.zip | |
Merge branch 'uuid-types'
Merge 'uuid-types' from git://git.infradead.org/users/hch/uuid.git
Diffstat (limited to 'lib/vsprintf.c')
| -rw-r--r-- | lib/vsprintf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 2d41de3f98a1..9f37d6208e99 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -1308,14 +1308,14 @@ char *uuid_string(char *buf, char *end, const u8 *addr, char uuid[UUID_STRING_LEN + 1]; char *p = uuid; int i; - const u8 *index = uuid_be_index; + const u8 *index = uuid_index; bool uc = false; switch (*(++fmt)) { case 'L': uc = true; /* fall-through */ case 'l': - index = uuid_le_index; + index = guid_index; break; case 'B': uc = true; |