Commit 77af1f2b authored by Linus Torvalds's avatar Linus Torvalds

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
parents c551afcd 5f7fdb0f
...@@ -131,7 +131,7 @@ static ssize_t available_uuids_show(struct device *dev, ...@@ -131,7 +131,7 @@ static ssize_t available_uuids_show(struct device *dev,
for (i = 0; i < INT3400_THERMAL_MAXIMUM_UUID; i++) { for (i = 0; i < INT3400_THERMAL_MAXIMUM_UUID; i++) {
if (priv->uuid_bitmap & (1 << 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; return length;
...@@ -149,7 +149,7 @@ static ssize_t current_uuid_show(struct device *dev, ...@@ -149,7 +149,7 @@ static ssize_t current_uuid_show(struct device *dev,
for (i = 0; i <= INT3400_THERMAL_CRITICAL; i++) { for (i = 0; i <= INT3400_THERMAL_CRITICAL; i++) {
if (priv->os_uuid_mask & BIT(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) if (length)
......
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