Skip to contentSkip to conversation

I8K: fix /proc reporting of blank service tags

PATCH New Dmitry Torokhov 1 participant 1 message Nov 12, 2005 Char and misc drivers

lore
Share & tools
lore

Dmitry Torokhov

author
#0 lore raw

PATCH 1/1 I8K: fix /proc reporting of blank service tags

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

Signed-off-by Dmitry Torokhov <[email protected]>

---

 drivers/char/i8k.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/char/i8k.c +4 -2
Index: work/drivers/char/i8k.c
===================================================================
@@ -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 : "?";
 }
 
 /*

@@ -396,7 +398,7 @@ static int i8k_proc_show(struct seq_file
 	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);