diff options
author | Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2016-07-14 06:10:46 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-07-25 13:28:12 -0400 |
commit | cec6dba24b42fec76820d0ad01b6480c9c81d764 (patch) | |
tree | 157176eaf66a217f27e8b5da96bcdca9bb4ceaf4 | |
parent | af8c34ce6ae32addda3788d54a7e340cad22516b (diff) |
PCI: xilinx: Fix return value in case of error
In xilinx_pcie_init_irq_domain(), the pattern used to check and return
error is:
if (!var) {
dev_err(...);
return PTR_ERR(var);
}
So the returned value in case of error is always 0, which means 'success'.
Change it to return -ENODEV instead.
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
-rw-r--r-- | drivers/pci/host/pcie-xilinx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c index 65f0fe0c2eaf..45413b2dbd5d 100644 --- a/drivers/pci/host/pcie-xilinx.c +++ b/drivers/pci/host/pcie-xilinx.c | |||
@@ -550,7 +550,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port) | |||
550 | pcie_intc_node = of_get_next_child(node, NULL); | 550 | pcie_intc_node = of_get_next_child(node, NULL); |
551 | if (!pcie_intc_node) { | 551 | if (!pcie_intc_node) { |
552 | dev_err(dev, "No PCIe Intc node found\n"); | 552 | dev_err(dev, "No PCIe Intc node found\n"); |
553 | return PTR_ERR(pcie_intc_node); | 553 | return -ENODEV; |
554 | } | 554 | } |
555 | 555 | ||
556 | port->irq_domain = irq_domain_add_linear(pcie_intc_node, 4, | 556 | port->irq_domain = irq_domain_add_linear(pcie_intc_node, 4, |
@@ -558,7 +558,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port) | |||
558 | port); | 558 | port); |
559 | if (!port->irq_domain) { | 559 | if (!port->irq_domain) { |
560 | dev_err(dev, "Failed to get a INTx IRQ domain\n"); | 560 | dev_err(dev, "Failed to get a INTx IRQ domain\n"); |
561 | return PTR_ERR(port->irq_domain); | 561 | return -ENODEV; |
562 | } | 562 | } |
563 | 563 | ||
564 | /* Setup MSI */ | 564 | /* Setup MSI */ |
@@ -569,7 +569,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port) | |||
569 | &xilinx_pcie_msi_chip); | 569 | &xilinx_pcie_msi_chip); |
570 | if (!port->irq_domain) { | 570 | if (!port->irq_domain) { |
571 | dev_err(dev, "Failed to get a MSI IRQ domain\n"); | 571 | dev_err(dev, "Failed to get a MSI IRQ domain\n"); |
572 | return PTR_ERR(port->irq_domain); | 572 | return -ENODEV; |
573 | } | 573 | } |
574 | 574 | ||
575 | xilinx_pcie_enable_msi(port); | 575 | xilinx_pcie_enable_msi(port); |