diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-07 07:37:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-07 07:37:45 +0200 |
| commit | 37ef1647b7f73d4ff4c7993984599b6c4f26443a (patch) | |
| tree | 95563fd5ba2c8595215616892127cd361a3ce1fd /drivers/base/cacheinfo.c | |
| parent | Merge tag 'staging-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | drivers/base: cacheinfo: handle absence of caches (diff) | |
| download | linux-37ef1647b7f73d4ff4c7993984599b6c4f26443a.tar.xz linux-37ef1647b7f73d4ff4c7993984599b6c4f26443a.zip | |
Merge tag 'driver-core-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fixes from Greg KH:
"Here are two fixes for the driver core that resolve some reported
issues.
One is a regression from 4.0, the other a fixes a reported oops that
has been there since 3.19.
Both have been in linux-next for a while with no problems"
* tag 'driver-core-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
drivers/base: cacheinfo: handle absence of caches
drivers: of/base: move of_init to driver_init
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) { 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), |