diff options
| author | Tom Rini <trini@konsulko.com> | 2019-11-01 09:23:21 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-11-01 09:23:21 -0400 |
| commit | 82679624f9aa6d1be733c46f3555d5166b6f5b72 (patch) | |
| tree | 8a99cf79bc520b833e155094ef134c0526b1f005 /lib/linux_compat.c | |
| parent | 412326d1bc2d346d7b4faad6fa547eaf065681a2 (diff) | |
| parent | 5d80a1a93d42c8325d65516cc654ff6a9ceec58a (diff) | |
Merge branch '2019-10-30-master-imports'
- Migrate test.py to use python3 and current pytest.
- NVMe bugfixes
- Assorted other fixes
- Android AVB updates.
Diffstat (limited to 'lib/linux_compat.c')
| -rw-r--r-- | lib/linux_compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/linux_compat.c b/lib/linux_compat.c index 6373b4451eb..81ea8fb126f 100644 --- a/lib/linux_compat.c +++ b/lib/linux_compat.c @@ -20,7 +20,7 @@ void *kmalloc(size_t size, int flags) void *p; p = malloc_cache_aligned(size); - if (flags & __GFP_ZERO) + if (p && flags & __GFP_ZERO) memset(p, 0, size); return p; |