diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-06-22 05:32:41 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-06-22 05:32:41 -0400 |
| commit | 57fa8a1e22c5833fb2cae96af68fc39ec21cb017 (patch) | |
| tree | b0bb4e4a6e04a24119da30253add9fe9ffbc8d22 /drivers/base/cacheinfo.c | |
| parent | f267f9dff8ba00a8b11f340da3634858ad50ebab (diff) | |
| parent | c99d49a8f81fb35e67b0ffa45f320a75e0b5639d (diff) | |
Merge tag 'asoc-v4.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Further updates for v4.2
There's a bunch of additional updates and fixes that came in since my
orignal pull request here, including DT support for rt5645 and fairly
large serieses of cleanups and improvements to tas2552 and rcar.
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 9c2ba1c97c42..df0c66cb7ad3 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c | |||
| @@ -179,7 +179,7 @@ static int detect_cache_attributes(unsigned int cpu) | |||
| 179 | { | 179 | { |
| 180 | int ret; | 180 | int ret; |
| 181 | 181 | ||
| 182 | if (init_cache_level(cpu)) | 182 | if (init_cache_level(cpu) || !cache_leaves(cpu)) |
| 183 | return -ENOENT; | 183 | return -ENOENT; |
| 184 | 184 | ||
| 185 | per_cpu_cacheinfo(cpu) = kcalloc(cache_leaves(cpu), | 185 | per_cpu_cacheinfo(cpu) = kcalloc(cache_leaves(cpu), |