]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
usb: core: sysfs: Unmerge @usb3_hardware_lpm_attr_group in remove_power_attributes()
authorZijun Hu <quic_zijuhu@quicinc.com>
Tue, 20 Aug 2024 11:01:27 +0000 (19:01 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 22 Aug 2024 09:29:50 +0000 (17:29 +0800)
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: 655fe4effe0f ("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>
drivers/usb/core/sysfs.c

index d83231d6736ac6f59eb6333ab315cf70e337f35a..61b6d978892c799e213018bed22d9fb12a19d429 100644 (file)
@@ -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);
 }