mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-22 04:15:02 +00:00
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: Thomas Renninger <trenn@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
188e1f81ba
commit
e7c746ef09
1 changed files with 11 additions and 4 deletions
|
@ -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)
|
||||||
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)
|
||||||
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");
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue