mirror of
https://github.com/torvalds/linux.git
synced 2026-05-29 17:43:52 +02:00
Additional thermal control update for 7.0-rc1
Fix sysfs group leak on DLVR registration failure in the Intel int340x thermal driver (Kaushlendra Kumar) -----BEGIN PGP SIGNATURE----- iQFGBAABCAAwFiEEcM8Aw/RY0dgsiRUR7l+9nS/U47UFAmmWFiASHHJqd0Byand5 c29ja2kubmV0AAoJEO5fvZ0v1OO1hOwH/3d74wJiY8QI8maslzarIFbI9lcq5axu LdFIuwf9FScw27oCktHsqmZuMQ2ETfCDnNy7qJXTJmznpVHsmK72EQmco1CU4f+M 4Wyk6WNKDMZyndKMqAQqevdNcJBSmJHRq7eLdOtaRLexRPZZXhfLb6nWlBeMzQeB aACtb1Zzgp1Nwmr/kwJXbi4UZXa3w+nLl9qEqKIuNh4y8DinJP93zWt3QlaByDH3 fRovEiVOAp1+pNdm32mfkfBN+DxM0lzqIW2j9lvBFHrq7pINo1eBQ+kIb4uvk9Cl 7nKdCF98Yf3b3aDhWvepmOgY4i479seGgMPOMpje3R7T3Tvn4S+QD+0= =R1jm -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
fa2827e72c
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user