Commit e7c746ef authored by Thomas Renninger's avatar Thomas Renninger Committed by Len Brown

ACPI: gracefully print null trip-point device

if acpi_bus_get_device() returns NULL, print nothing
instead of "<NUL" in /proc/acpi/thermal_zone/*/trip_points
Signed-off-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 188e1f81
...@@ -828,6 +828,8 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset) ...@@ -828,6 +828,8 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
{ {
struct acpi_thermal *tz = seq->private; struct acpi_thermal *tz = seq->private;
struct acpi_device *device; struct acpi_device *device;
acpi_status status;
int i = 0; int i = 0;
int j = 0; int j = 0;
...@@ -850,8 +852,10 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset) ...@@ -850,8 +852,10 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
tz->trips.passive.tc1, tz->trips.passive.tc2, tz->trips.passive.tc1, tz->trips.passive.tc2,
tz->trips.passive.tsp); tz->trips.passive.tsp);
for (j = 0; j < tz->trips.passive.devices.count; j++) { for (j = 0; j < tz->trips.passive.devices.count; j++) {
acpi_bus_get_device(tz->trips.passive.devices.handles[j], &device); status = acpi_bus_get_device(tz->trips.passive.devices.
seq_printf(seq, "%4.4s ", acpi_device_bid(device)); handles[j], &device);
seq_printf(seq, "%4.4s ", status ? "" :
acpi_device_bid(device));
} }
seq_puts(seq, "\n"); seq_puts(seq, "\n");
} }
...@@ -863,8 +867,11 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset) ...@@ -863,8 +867,11 @@ static int acpi_thermal_trip_seq_show(struct seq_file *seq, void *offset)
i, i,
KELVIN_TO_CELSIUS(tz->trips.active[i].temperature)); KELVIN_TO_CELSIUS(tz->trips.active[i].temperature));
for (j = 0; j < tz->trips.active[i].devices.count; j++){ for (j = 0; j < tz->trips.active[i].devices.count; j++){
acpi_bus_get_device(tz->trips.active[i].devices.handles[j], &device); status = acpi_bus_get_device(tz->trips.active[i].
seq_printf(seq, "%4.4s ", acpi_device_bid(device)); devices.handles[j],
&device);
seq_printf(seq, "%4.4s ", status ? "" :
acpi_device_bid(device));
} }
seq_puts(seq, "\n"); seq_puts(seq, "\n");
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment