Skip to content

Commit

Permalink
[PATCH] I8K: fix /proc reporting of blank service tags
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dmitry Torokhov authored and Linus Torvalds committed Nov 12, 2005
1 parent 44e6f84 commit 4f00555
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/char/i8k.c
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ struct smm_regs {

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 : "?";
}

/*
Expand Down Expand Up @@ -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",
I8K_PROC_FMT,
bios_version,
dmi_get_system_info(DMI_PRODUCT_SERIAL) ? : "N/A",
i8k_get_dmi_data(DMI_PRODUCT_SERIAL),
cpu_temp,
left_fan, right_fan, left_speed, right_speed,
ac_power, fn_key);
Expand Down

0 comments on commit 4f00555

Please sign in to comment.