File tree Expand file tree Collapse file tree 1 file changed +11
-8
lines changed Expand file tree Collapse file tree 1 file changed +11
-8
lines changed Original file line number Diff line number Diff line change @@ -657,30 +657,33 @@ void of_pci_make_dev_node(struct pci_dev *pdev)
657
657
658
658
cset = kmalloc (sizeof (* cset ), GFP_KERNEL );
659
659
if (!cset )
660
- goto failed ;
660
+ goto out_free_name ;
661
661
of_changeset_init (cset );
662
662
663
663
np = of_changeset_create_node (cset , ppnode , name );
664
664
if (!np )
665
- goto failed ;
666
- np -> data = cset ;
665
+ goto out_destroy_cset ;
667
666
668
667
ret = of_pci_add_properties (pdev , cset , np );
669
668
if (ret )
670
- goto failed ;
669
+ goto out_free_node ;
671
670
672
671
ret = of_changeset_apply (cset );
673
672
if (ret )
674
- goto failed ;
673
+ goto out_free_node ;
675
674
675
+ np -> data = cset ;
676
676
pdev -> dev .of_node = np ;
677
677
kfree (name );
678
678
679
679
return ;
680
680
681
- failed :
682
- if (np )
683
- of_node_put (np );
681
+ out_free_node :
682
+ of_node_put (np );
683
+ out_destroy_cset :
684
+ of_changeset_destroy (cset );
685
+ kfree (cset );
686
+ out_free_name :
684
687
kfree (name );
685
688
}
686
689
#endif
You can’t perform that action at this time.
0 commit comments