From 81ae37c58709cf1396b09e5136acfc8a0c259476 Mon Sep 17 00:00:00 2001 From: Burt P Date: Tue, 25 Jul 2017 14:33:49 -0500 Subject: device tree: fix crash when device tree is not found * check if device tree was found before add_keys() * UNKIFNULL(model) before strcmp * make UNKIFNULL() STRIFNULL() EMPIFNULL() macros more generic Signed-off-by: Burt P --- modules/devices/parisc/processor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/devices/parisc') diff --git a/modules/devices/parisc/processor.c b/modules/devices/parisc/processor.c index c4eede8a..1a5b6f46 100644 --- a/modules/devices/parisc/processor.c +++ b/modules/devices/parisc/processor.c @@ -104,9 +104,9 @@ processor_scan(void) processor = (Processor *) pi->data; /* strings can't be null or segfault later */ - STRIFNULL(model_name, _("PA-RISC Processor") ); - STRIFNULL(cpu_family, "PA-RISC"); - UNKIFNULL(strmodel); + STRIFNULL(processor->model_name, _("PA-RISC Processor") ); + STRIFNULL(processor->cpu_family, "PA-RISC"); + UNKIFNULL(processor->strmodel); /* topo & freq */ processor->cpufreq = cpufreq_new(processor->id); -- cgit v1.2.3