Skip to content

Commit 77af1f2

Browse files
committed
Merge tag 'thermal-6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fix from Rafael Wysocki: "Fix a regression introduced inadvertently during the 6.3 cycle by a commit making the Intel int340x thermal driver use sysfs_emit_at() instead of scnprintf() (Srinivas Pandruvada)" * tag 'thermal-6.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: thermal: intel: int340x: Add new line for UUID display
2 parents c551afc + 5f7fdb0 commit 77af1f2

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/thermal/intel/int340x_thermal/int3400_thermal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static ssize_t available_uuids_show(struct device *dev,
131131

132132
for (i = 0; i < INT3400_THERMAL_MAXIMUM_UUID; i++) {
133133
if (priv->uuid_bitmap & (1 << i))
134-
length += sysfs_emit_at(buf, length, int3400_thermal_uuids[i]);
134+
length += sysfs_emit_at(buf, length, "%s\n", int3400_thermal_uuids[i]);
135135
}
136136

137137
return length;
@@ -149,7 +149,7 @@ static ssize_t current_uuid_show(struct device *dev,
149149

150150
for (i = 0; i <= INT3400_THERMAL_CRITICAL; i++) {
151151
if (priv->os_uuid_mask & BIT(i))
152-
length += sysfs_emit_at(buf, length, int3400_thermal_uuids[i]);
152+
length += sysfs_emit_at(buf, length, "%s\n", int3400_thermal_uuids[i]);
153153
}
154154

155155
if (length)

0 commit comments

Comments
 (0)