aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Documentation/devicetree/bindings/thermal/thermal-zones.yaml2
-rw-r--r--MAINTAINERS2
-rw-r--r--drivers/thermal/thermal_core.c6
3 files changed, 6 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/thermal/thermal-zones.yaml b/Documentation/devicetree/bindings/thermal/thermal-zones.yaml
index 4f3acdc4dec0..4a8dabc48170 100644
--- a/Documentation/devicetree/bindings/thermal/thermal-zones.yaml
+++ b/Documentation/devicetree/bindings/thermal/thermal-zones.yaml
@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/base.yaml#
title: Thermal zone
maintainers:
- - Amit Kucheria <[email protected]>
+ - Daniel Lezcano <[email protected]>
description: |
Thermal management is achieved in devicetree by describing the sensor hardware
diff --git a/MAINTAINERS b/MAINTAINERS
index b19995690904..65289d939097 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -21362,8 +21362,8 @@ F: drivers/media/radio/radio-raremono.c
THERMAL
M: Rafael J. Wysocki <[email protected]>
M: Daniel Lezcano <[email protected]>
-R: Amit Kucheria <[email protected]>
R: Zhang Rui <[email protected]>
+R: Lukasz Luba <[email protected]>
S: Supported
Q: https://patchwork.kernel.org/project/linux-pm/list/
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 8ee22eb804d3..2b345f25dfa4 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -662,7 +662,8 @@ int thermal_bind_cdev_to_trip(struct thermal_zone_device *tz,
if (result)
goto release_ida;
- sprintf(dev->attr_name, "cdev%d_trip_point", dev->id);
+ snprintf(dev->attr_name, sizeof(dev->attr_name), "cdev%d_trip_point",
+ dev->id);
sysfs_attr_init(&dev->attr.attr);
dev->attr.attr.name = dev->attr_name;
dev->attr.attr.mode = 0444;
@@ -671,7 +672,8 @@ int thermal_bind_cdev_to_trip(struct thermal_zone_device *tz,
if (result)
goto remove_symbol_link;
- sprintf(dev->weight_attr_name, "cdev%d_weight", dev->id);
+ snprintf(dev->weight_attr_name, sizeof(dev->weight_attr_name),
+ "cdev%d_weight", dev->id);
sysfs_attr_init(&dev->weight_attr.attr);
dev->weight_attr.attr.name = dev->weight_attr_name;
dev->weight_attr.attr.mode = S_IWUSR | S_IRUGO;