Merge tag 'thermal-7.0-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

torvalds · torvalds · commit fa2827e72cfc · 2026-02-18T14:33:18.000-08:00
Pull thermal control fix from Rafael Wysocki:
 "This fixes a sysfs group leak on DLVR registration failure in the
  Intel int340x thermal driver (Kaushlendra Kumar)"

* tag 'thermal-7.0-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  thermal: int340x: Fix sysfs group leak on DLVR registration failure
diff --git a/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c b/drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c
@@ -467,8 +467,11 @@ int proc_thermal_rfim_add(struct pci_dev *pdev, struct proc_thermal_device *proc
 			break;
 		}
 		ret = sysfs_create_group(&pdev->dev.kobj, &dlvr_attribute_group);
-		if (ret)
+		if (ret) {
+			if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_FIVR)
+				sysfs_remove_group(&pdev->dev.kobj, &fivr_attribute_group);
 			return ret;
+		}
 	}
 
 	if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_DVFS) {

Original file line number	Diff line number	Diff line change
`@@ -467,8 +467,11 @@ int proc_thermal_rfim_add(struct pci_dev pdev, struct proc_thermal_device proc`
`467`	`467`	`break;`
`468`	`468`	`}`
`469`	`469`	`ret = sysfs_create_group(&pdev->dev.kobj, &dlvr_attribute_group);`
`470`		`- if (ret)`
	`470`	`+ if (ret) {`
	`471`	`+ if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_FIVR)`
	`472`	`+ sysfs_remove_group(&pdev->dev.kobj, &fivr_attribute_group);`
`471`	`473`	`return ret;`
	`474`	`+ }`
`472`	`475`	`}`
`473`	`476`
`474`	`477`	`if (proc_priv->mmio_feature_mask & PROC_THERMAL_FEATURE_DVFS) {`