mirror of
https://github.com/torvalds/linux.git
synced 2026-11-06 21:58:01 +01:00
Merge branch 'pci/controller/xilinx-dma-pl'
- Fix device node reference leak in xilinx_pl_dma_pcie_init_irq_domain() (Wentao Liang) * pci/controller/xilinx-dma-pl: PCI: xilinx-xdma: Fix device node reference leak in xilinx_pl_dma_pcie_init_irq_domain()
This commit is contained in:
commit
f04ea86f98
|
|
@ -581,7 +581,7 @@ static int xilinx_pl_dma_pcie_init_irq_domain(struct pl_dma_pcie *port)
|
|||
port->pldma_domain = irq_domain_create_linear(of_fwnode_handle(pcie_intc_node), 32,
|
||||
&event_domain_ops, port);
|
||||
if (!port->pldma_domain)
|
||||
return -ENOMEM;
|
||||
goto err_put_node;
|
||||
|
||||
irq_domain_update_bus_token(port->pldma_domain, DOMAIN_BUS_NEXUS);
|
||||
|
||||
|
|
@ -589,7 +589,7 @@ static int xilinx_pl_dma_pcie_init_irq_domain(struct pl_dma_pcie *port)
|
|||
&intx_domain_ops, port);
|
||||
if (!port->intx_domain) {
|
||||
dev_err(dev, "Failed to get a INTx IRQ domain\n");
|
||||
return -ENOMEM;
|
||||
goto err_put_node;
|
||||
}
|
||||
|
||||
irq_domain_update_bus_token(port->intx_domain, DOMAIN_BUS_WIRED);
|
||||
|
|
@ -597,13 +597,17 @@ static int xilinx_pl_dma_pcie_init_irq_domain(struct pl_dma_pcie *port)
|
|||
ret = xilinx_pl_dma_pcie_init_msi_irq_domain(port);
|
||||
if (ret != 0) {
|
||||
irq_domain_remove(port->intx_domain);
|
||||
return -ENOMEM;
|
||||
goto err_put_node;
|
||||
}
|
||||
|
||||
of_node_put(pcie_intc_node);
|
||||
raw_spin_lock_init(&port->lock);
|
||||
|
||||
return 0;
|
||||
|
||||
err_put_node:
|
||||
of_node_put(pcie_intc_node);
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
static int xilinx_pl_dma_pcie_setup_irq(struct pl_dma_pcie *port)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user