Merge branch 'pci/ctrl/microchip'

bjorn-helgaas · bjorn-helgaas · commit 4faef1089652 · 2022-08-04T11:41:57.000-05:00
- Fix refcount leak in mc_pcie_init_irq_domains() (Miaoqian Lin)

* pci/ctrl/microchip:
  PCI: microchip: Fix refcount leak in mc_pcie_init_irq_domains()
diff --git a/drivers/pci/controller/pcie-microchip-host.c b/drivers/pci/controller/pcie-microchip-host.c
@@ -904,6 +904,7 @@ static int mc_pcie_init_irq_domains(struct mc_pcie *port)
 						   &event_domain_ops, port);
 	if (!port->event_domain) {
 		dev_err(dev, "failed to get event domain\n");
+		of_node_put(pcie_intc_node);
 		return -ENOMEM;
 	}
 
@@ -913,6 +914,7 @@ static int mc_pcie_init_irq_domains(struct mc_pcie *port)
 						  &intx_domain_ops, port);
 	if (!port->intx_domain) {
 		dev_err(dev, "failed to get an INTx IRQ domain\n");
+		of_node_put(pcie_intc_node);
 		return -ENOMEM;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -904,6 +904,7 @@ static int mc_pcie_init_irq_domains(struct mc_pcie *port)`
`904`	`904`	`&event_domain_ops, port);`
`905`	`905`	`if (!port->event_domain) {`
`906`	`906`	`dev_err(dev, "failed to get event domain\n");`
	`907`	`+ of_node_put(pcie_intc_node);`
`907`	`908`	`return -ENOMEM;`
`908`	`909`	`}`
`909`	`910`
`@@ -913,6 +914,7 @@ static int mc_pcie_init_irq_domains(struct mc_pcie *port)`
`913`	`914`	`&intx_domain_ops, port);`
`914`	`915`	`if (!port->intx_domain) {`
`915`	`916`	`dev_err(dev, "failed to get an INTx IRQ domain\n");`
	`917`	`+ of_node_put(pcie_intc_node);`
`916`	`918`	`return -ENOMEM;`
`917`	`919`	`}`
`918`	`920`