]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
net: ena: Fix error return code in ena_device_init()
authorWei Yongjun <weiyj.lk@gmail.com>
Mon, 13 Feb 2017 23:09:56 +0000 (15:09 -0800)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Thu, 6 Apr 2017 08:25:47 +0000 (09:25 +0100)
BugLink: http://bugs.launchpad.net/bugs/1664312
Fix to return a negative error code from the invalid dma width
error handling case instead of 0.

Signed-off-by: Wei Yongjun <weiyj.lk@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 6e22066fd02b675260b980b3e42b7d616a9839c5)
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
drivers/net/ethernet/amazon/ena/ena_netdev.c

index 499a22b165f1ba99ad2bbfd2ebfa64cbdcfd8168..5c536b8ec99ce439f7045f5125af42f9fd1fd5b8 100644 (file)
@@ -2329,6 +2329,7 @@ static int ena_device_init(struct ena_com_dev *ena_dev, struct pci_dev *pdev,
        dma_width = ena_com_get_dma_width(ena_dev);
        if (dma_width < 0) {
                dev_err(dev, "Invalid dma width value %d", dma_width);
+               rc = dma_width;
                goto err_mmio_read_less;
        }