aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2012-10-07 14:57:15 +0200
committerPatrick Georgi <patrick@georgi-clan.de>2012-10-07 21:48:47 +0200
commit9c9eb8cbc9deadf2b342236f71d1c9da59a97644 (patch)
tree379fbd35708d2b6b69bac0a2bcd98fbc8766edac
parente5fe3acb5a1d5f14b9e84cf03f4e67e34e267ba7 (diff)
Take care of NULL chip_ops->name
Change-Id: I62b1c497d23ec2241efb963e7834728085824016 Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/1565 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
-rw-r--r--src/arch/x86/boot/smbios.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c
index 8877f60ea3..a1717078fb 100644
--- a/src/arch/x86/boot/smbios.c
+++ b/src/arch/x86/boot/smbios.c
@@ -278,7 +278,8 @@ static int smbios_walk_device_tree(device_t tree, int *handle, unsigned long *cu
int len = 0;
for(dev = tree; dev; dev = dev->next) {
- printk(BIOS_INFO, "%s (%s)\n", dev_path(dev), dev->chip_ops ? dev->chip_ops->name : "");
+ printk(BIOS_INFO, "%s (%s)\n", dev_path(dev),
+ (dev->chip_ops && dev->chip_ops->name) ? dev->chip_ops->name : "");
if (dev->ops && dev->ops->get_smbios_data)
len += dev->ops->get_smbios_data(dev, handle, current);