Commit fa2827e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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
parents 9a199794 15176b81

drivers/thermal/intel/int340x_thermal/processor_thermal_rfim.c

+4 −1
Original line number Diff line number Diff line
@@ -467,9 +467,12 @@ 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) {

		ret = sysfs_create_group(&pdev->dev.kobj, &dvfs_attribute_group);