git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
[pandora-kernel.git]
/
drivers
/
char
/
i8k.c
diff --git
a/drivers/char/i8k.c
b/drivers/char/i8k.c
index
6c4b3f9
..
353d9f3
100644
(file)
--- a/
drivers/char/i8k.c
+++ b/
drivers/char/i8k.c
@@
-80,7
+80,7
@@
static int i8k_open_fs(struct inode *inode, struct file *file);
static int i8k_ioctl(struct inode *, struct file *, unsigned int,
unsigned long);
static int i8k_ioctl(struct inode *, struct file *, unsigned int,
unsigned long);
-static struct file_operations i8k_fops = {
+static
const
struct file_operations i8k_fops = {
.open = i8k_open_fs,
.read = seq_read,
.llseek = seq_lseek,
.open = i8k_open_fs,
.read = seq_read,
.llseek = seq_lseek,
@@
-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",
I8K_PROC_FMT,
bios_version,
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);
cpu_temp,
left_fan, right_fan, left_speed, right_speed,
ac_power, fn_key);