usb: core: sysfs: Unmerge @usb3_hardware_lpm_attr_group in remove_power_attributes()

Zijun Hu · gregkh · commit 3a8839bbb86d · 2024-08-22T17:29:50.000+08:00
Device attribute group @usb3_hardware_lpm_attr_group is merged by add_power_attributes(), but it is not unmerged explicitly, fixed by unmerging it in remove_power_attributes(). Fixes: 655fe4e ("usbcore: add sysfs support to xHCI usb3 hardware LPM") Cc: stable@vger.kernel.org Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com> Link: https://lore.kernel.org/r/20240820-sysfs_fix-v2-1-a9441487077e@quicinc.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c
@@ -670,6 +670,7 @@ static int add_power_attributes(struct device *dev)
 
 static void remove_power_attributes(struct device *dev)
 {
+	sysfs_unmerge_group(&dev->kobj, &usb3_hardware_lpm_attr_group);
 	sysfs_unmerge_group(&dev->kobj, &usb2_hardware_lpm_attr_group);
 	sysfs_unmerge_group(&dev->kobj, &power_attr_group);
 }

Original file line number	Diff line number	Diff line change
`@@ -670,6 +670,7 @@ static int add_power_attributes(struct device *dev)`
`670`	`670`
`671`	`671`	`static void remove_power_attributes(struct device *dev)`
`672`	`672`	`{`
	`673`	`+ sysfs_unmerge_group(&dev->kobj, &usb3_hardware_lpm_attr_group);`
`673`	`674`	`sysfs_unmerge_group(&dev->kobj, &usb2_hardware_lpm_attr_group);`
`674`	`675`	`sysfs_unmerge_group(&dev->kobj, &power_attr_group);`
`675`	`676`	`}`