Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'devprop-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull device properties framework fix from Rafael Wysocki:
"Revert a problematic commit from the 5.3 development cycle (Brendan
Higgins)"
* tag 'devprop-5.6-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "software node: Simplify software_node_release() function"
+7
-7
+7
-7
drivers/base/swnode.c
+7
-7
drivers/base/swnode.c
···
608
608
{
609
609
struct swnode *swnode = kobj_to_swnode(kobj);
610
610
611
+
if (swnode->parent) {
612
+
ida_simple_remove(&swnode->parent->child_ids, swnode->id);
613
+
list_del(&swnode->entry);
614
+
} else {
615
+
ida_simple_remove(&swnode_root_ids, swnode->id);
616
+
}
617
+
611
618
if (swnode->allocated) {
612
619
property_entries_free(swnode->node->properties);
613
620
kfree(swnode->node);
···
779
772
780
773
if (!swnode)
781
774
return;
782
-
783
-
if (swnode->parent) {
784
-
ida_simple_remove(&swnode->parent->child_ids, swnode->id);
785
-
list_del(&swnode->entry);
786
-
} else {
787
-
ida_simple_remove(&swnode_root_ids, swnode->id);
788
-
}
789
775
790
776
kobject_put(&swnode->kobj);
791
777
}