aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-01-31 14:39:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2020-01-31 14:39:21 -0800
commit68b62e5d965a8cbcfa287ee7754cf06e9b3775ab (patch)
tree873bff0c72d1edb9d24aae7733b471f1e6721208 /drivers/thermal
parentMerge tag 'acpi-5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff)
parentthermal: stm32: fix spelling mistake "preprare" -> "prepare" (diff)
downloadlinux-dev-68b62e5d965a8cbcfa287ee7754cf06e9b3775ab.tar.xz
linux-dev-68b62e5d965a8cbcfa287ee7754cf06e9b3775ab.zip
Merge tag 'thermal-v5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux
Pull thermal fixes from Daniel Lezcano: - Fix a severe docs build failure for cpu idle cooling device (Randy Dunlap) - Fix a spelling mistake in the error message for the stm32 (Colin Ian King) * tag 'thermal-v5.6-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux: thermal: stm32: fix spelling mistake "preprare" -> "prepare" Documentation: cpu-idle-cooling: fix a SEVERE docs build failure
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/st/stm_thermal.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/st/stm_thermal.c b/drivers/thermal/st/stm_thermal.c
index 1cc5e6c5709e..ad9e3bf8fdf6 100644
--- a/drivers/thermal/st/stm_thermal.c
+++ b/drivers/thermal/st/stm_thermal.c
@@ -535,7 +535,7 @@ static int stm_thermal_probe(struct platform_device *pdev)
/* Configure and enable HW sensor */
ret = stm_thermal_prepare(sensor);
if (ret) {
- dev_err(&pdev->dev, "Error preprare sensor: %d\n", ret);
+ dev_err(&pdev->dev, "Error prepare sensor: %d\n", ret);
return ret;
}