mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-24 05:29:04 -04:00
Merge branch 'uuid-types'
Merge 'uuid-types' from git://git.infradead.org/users/hch/uuid.git
This commit is contained in:
commit
875aabf52e
76 changed files with 373 additions and 500 deletions
|
|
@ -1119,7 +1119,7 @@ static ssize_t bin_uuid(struct file *file,
|
|||
/* Only supports reads */
|
||||
if (oldval && oldlen) {
|
||||
char buf[UUID_STRING_LEN + 1];
|
||||
uuid_be uuid;
|
||||
uuid_t uuid;
|
||||
|
||||
result = kernel_read(file, 0, buf, sizeof(buf) - 1);
|
||||
if (result < 0)
|
||||
|
|
@ -1128,7 +1128,7 @@ static ssize_t bin_uuid(struct file *file,
|
|||
buf[result] = '\0';
|
||||
|
||||
result = -EIO;
|
||||
if (uuid_be_to_bin(buf, &uuid))
|
||||
if (uuid_parse(buf, &uuid))
|
||||
goto out;
|
||||
|
||||
if (oldlen > 16)
|
||||
|
|
|
|||
Loading…
Reference in a new issue