diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-01 09:35:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-01 09:35:49 +0200 |
| commit | 35c88cabb17937c0a500f82d580c3db48c742dd4 (patch) | |
| tree | f5fed9283be58e42409cb4902c63308fe5452750 /arch/x86/kernel/amd_nb.c | |
| parent | 8eda072e9d7c3429a372e3635dc5851f4a42dee1 (diff) | |
| parent | 1ead852dd88779eda12cb09cc894a03d9abfe1ec (diff) | |
| download | linux-35c88cabb17937c0a500f82d580c3db48c742dd4.tar.gz linux-35c88cabb17937c0a500f82d580c3db48c742dd4.tar.bz2 linux-35c88cabb17937c0a500f82d580c3db48c742dd4.zip | |
Merge branch 'x86/urgent' into x86/cpu, to pick up dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/amd_nb.c')
| -rw-r--r-- | arch/x86/kernel/amd_nb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c index a147e676fc7b..e991d5c8bb3a 100644 --- a/arch/x86/kernel/amd_nb.c +++ b/arch/x86/kernel/amd_nb.c @@ -71,8 +71,8 @@ int amd_cache_northbridges(void) while ((misc = next_northbridge(misc, amd_nb_misc_ids)) != NULL) i++; - if (i == 0) - return 0; + if (!i) + return -ENODEV; nb = kzalloc(i * sizeof(struct amd_northbridge), GFP_KERNEL); if (!nb) |