diff options
| author | Greg Kroah-Hartman | 2015-06-08 19:19:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2015-06-08 19:19:40 +0200 |
| commit | 987aec39a74373c55c3bedd5c3c83896d78fd0a2 (patch) | |
| tree | 66aba6d4f166f269be95fe4d267d57efe533aefd /drivers/base/cacheinfo.c | |
| parent | firmware: add missing kfree for work on async call (diff) | |
| parent | Linux 4.1-rc7 (diff) | |
| download | kernel-qcow2-linux-987aec39a74373c55c3bedd5c3c83896d78fd0a2.tar.gz kernel-qcow2-linux-987aec39a74373c55c3bedd5c3c83896d78fd0a2.tar.xz kernel-qcow2-linux-987aec39a74373c55c3bedd5c3c83896d78fd0a2.zip | |
Merge 4.1-rc7 into driver-core-next
We want the fixes in this branch as well for testing and merge
resolution.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base/cacheinfo.c')
| -rw-r--r-- | drivers/base/cacheinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c index c75bda89821b..764280a91776 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -179,7 +179,7 @@ static int detect_cache_attributes(unsigned int cpu) { int ret; - if (init_cache_level(cpu)) + if (init_cache_level(cpu) || !cache_leaves(cpu)) return -ENOENT; per_cpu_cacheinfo(cpu) = kcalloc(cache_leaves(cpu), |