summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-07-08 09:06:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-08 09:06:52 -0700
commita017f583ec87d40b06eee6a6beeabe879c8113dd (patch)
tree51056b0108404c1cb9508c4bf0dcd73249848022 /arch
parent369da7fc6d627aca19baec09ebe4486c69aef5f2 (diff)
parentc76a093dc1415d364020b8b33f1e194ef4d26fd0 (diff)
downloadlinux-a017f583ec87d40b06eee6a6beeabe879c8113dd.tar.gz
linux-a017f583ec87d40b06eee6a6beeabe879c8113dd.tar.xz
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar: "Three fixes: - A boot crash fix with certain configs - a MAINTAINERS entry update - Documentation typo fixes" * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/Documentation: Fix various typos in Documentation/x86/ files x86/amd_nb: Fix boot crash on non-AMD systems MAINTAINERS: Update the Calgary IOMMU entry
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kernel/amd_nb.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index a147e67..e991d5c 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)