diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2006-01-03 18:18:01 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-01-03 18:18:01 +1100 |
| commit | 97f2aab6698f3ab2552c41c1024a65ffd0763a6d (patch) | |
| tree | bb6e3b2949459f54f884c710fc74d40eef00d834 /drivers/char/i8k.c | |
| parent | d985c1088146607532093d9eaaaf99758f6a4d21 (diff) | |
| parent | 88026842b0a760145aa71d69e74fbc9ec118ca44 (diff) | |
| download | op-kernel-dev-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.zip op-kernel-dev-97f2aab6698f3ab2552c41c1024a65ffd0763a6d.tar.gz | |
drm: merge in Linus mainline
Diffstat (limited to 'drivers/char/i8k.c')
| -rw-r--r-- | drivers/char/i8k.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/char/i8k.c b/drivers/char/i8k.c index 6c4b3f9..f3c3aaf 100644 --- a/drivers/char/i8k.c +++ b/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 *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); |
