Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 14007
b: refs/heads/master
c: 4f00555
h: refs/heads/master
i:
  14005: 4a2e8a9
  14003: a38af27
  13999: c7a6583
v: v3
  • Loading branch information
Dmitry Torokhov authored and Linus Torvalds committed Nov 12, 2005
1 parent e56d210 commit c573a3a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 44e6f84e3597905816a0440e7218d2ed072120da
refs/heads/master: 4f005551a8fac21b6fec8d10d57cd12d373d79e1
6 changes: 4 additions & 2 deletions trunk/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 c573a3a

Please sign in to comment.