lkml.org 
[lkml]   [2016]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.16.y-ckt 128/142] net: moxa: fix an error code
    Date
    3.16.7-ckt26 -stable review patch.  If anyone has any objections, please let me know.

    ---8<------------------------------------------------------------

    From: Dan Carpenter <dan.carpenter@oracle.com>

    commit 1d3cd1773fddfdc9ffb0c2dec9a954c7a54bc207 upstream.

    We accidentally return IS_ERR(priv->base) which is 1 instead of
    PTR_ERR(priv->base) which is the error code.

    Fixes: 6c821bd9edc9 ('net: Add MOXA ART SoCs ethernet driver')
    Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
    Acked-by: Arnd Bergmann <arnd@arndb.de>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/net/ethernet/moxa/moxart_ether.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c
    index 5020fd47825d..d627a78912e3 100644
    --- a/drivers/net/ethernet/moxa/moxart_ether.c
    +++ b/drivers/net/ethernet/moxa/moxart_ether.c
    @@ -456,9 +456,9 @@ static int moxart_mac_probe(struct platform_device *pdev)
    res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
    ndev->base_addr = res->start;
    priv->base = devm_ioremap_resource(p_dev, res);
    - ret = IS_ERR(priv->base);
    - if (ret) {
    + if (IS_ERR(priv->base)) {
    dev_err(p_dev, "devm_ioremap_resource failed\n");
    + ret = PTR_ERR(priv->base);
    goto init_fail;
    }

    \
     
     \ /
      Last update: 2016-03-22 12:21    [W:9.182 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site