Skip to content

Commit

Permalink
Merge tag 'thermal-6.4-rc4' of git://git.kernel.org/pub/scm/linux/ker…
Browse files Browse the repository at this point in the history
…nel/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
  • Loading branch information
torvalds committed May 26, 2023
2 parents c551afc + 5f7fdb0 commit 77af1f2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/thermal/intel/int340x_thermal/int3400_thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ static ssize_t available_uuids_show(struct device *dev,

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

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

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

if (length)
Expand Down

0 comments on commit 77af1f2

Please sign in to comment.