lkml.org 
[lkml]   [2016]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] PCI: xilinx: Fix return value in case of error
On Thu, Jul 14, 2016 at 12:10:46PM +0200, Christophe JAILLET wrote:
> In function '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>

Applied with Sören's ack to pci/host-xilinx for v4.8, thanks!

> ---
> drivers/pci/host/pcie-xilinx.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
> index 4703aa3..a30e016 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)
> pcie_intc_node = of_get_next_child(node, NULL);
> if (!pcie_intc_node) {
> dev_err(dev, "No PCIe Intc node found\n");
> - return PTR_ERR(pcie_intc_node);
> + return -ENODEV;
> }
>
> 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)
> port);
> if (!port->irq_domain) {
> dev_err(dev, "Failed to get a INTx IRQ domain\n");
> - return PTR_ERR(port->irq_domain);
> + return -ENODEV;
> }
>
> /* Setup MSI */
> @@ -569,7 +569,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
> &xilinx_pcie_msi_chip);
> if (!port->irq_domain) {
> dev_err(dev, "Failed to get a MSI IRQ domain\n");
> - return PTR_ERR(port->irq_domain);
> + return -ENODEV;
> }
>
> xilinx_pcie_enable_msi(port);
> --
> 2.7.4
>
>
> ---
> L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast.
> https://www.avast.com/antivirus
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html

\
 
 \ /
  Last update: 2016-07-25 20:01    [W:0.898 / U:0.572 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site