lkml.org 
[lkml]   [2021]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 131/171] net: altera: set a couple error code in probe()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit badd7857f5c933a3dc34942a2c11d67fdbdc24de upstream.

    There are two error paths which accidentally return success instead of
    a negative error code.

    Fixes: bbd2190ce96d ("Altera TSE: Add main and header file for Altera Ethernet Driver")
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/altera/altera_tse_main.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    --- a/drivers/net/ethernet/altera/altera_tse_main.c
    +++ b/drivers/net/ethernet/altera/altera_tse_main.c
    @@ -1430,16 +1430,19 @@ static int altera_tse_probe(struct platf
    priv->rxdescmem_busaddr = dma_res->start;

    } else {
    + ret = -ENODEV;
    goto err_free_netdev;
    }

    - if (!dma_set_mask(priv->device, DMA_BIT_MASK(priv->dmaops->dmamask)))
    + if (!dma_set_mask(priv->device, DMA_BIT_MASK(priv->dmaops->dmamask))) {
    dma_set_coherent_mask(priv->device,
    DMA_BIT_MASK(priv->dmaops->dmamask));
    - else if (!dma_set_mask(priv->device, DMA_BIT_MASK(32)))
    + } else if (!dma_set_mask(priv->device, DMA_BIT_MASK(32))) {
    dma_set_coherent_mask(priv->device, DMA_BIT_MASK(32));
    - else
    + } else {
    + ret = -EIO;
    goto err_free_netdev;
    + }

    /* MAC address space */
    ret = request_and_map(pdev, "control_port", &control_port,

    \
     
     \ /
      Last update: 2021-12-13 11:10    [W:4.091 / U:0.124 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site