lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] I8K: fix /proc reporting of blank service tags

Browse Source 
Make /proc/i8k display '?' when service tag is blank in BIOS.
This fixes segfault in i8k gkrellm plugin.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Dmitry Torokhov
2005-11-12 00:55:15 -05:00
committed by Linus Torvalds
parent 44e6f84e35
commit 4f005551a8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/i8k.c
View File

@@ -99,7 +99,9 @@ struct smm_regs {
static inline char *i8k_get_dmi_data(int field) static inline char *i8k_get_dmi_data(int field)
{ {
return dmi_get_system_info(field) ? : "N/A"; char *dmi_data = dmi_get_system_info(field);
return dmi_data && *dmi_data ? dmi_data : "?";
} }
/* /*
@@ -396,7 +398,7 @@ static int i8k_proc_show(struct seq_file *seq, void *offset)
return seq_printf(seq, "%s %s %s %d %d %d %d %d %d %d\n", return seq_printf(seq, "%s %s %s %d %d %d %d %d %d %d\n",
I8K_PROC_FMT, I8K_PROC_FMT,
bios_version, bios_version,
dmi_get_system_info(DMI_PRODUCT_SERIAL) ? : "N/A", i8k_get_dmi_data(DMI_PRODUCT_SERIAL),
cpu_temp, cpu_temp,
left_fan, right_fan, left_speed, right_speed, left_fan, right_fan, left_speed, right_speed,
ac_power, fn_key); ac_power, fn_key);