lkml.org 
[lkml]   [2013]   [Mar]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 083/100] usbnet: smsc95xx: fix suspend failure
    Date
    3.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Ming Lei <ming.lei@canonical.com>

    commit 7643721471117d5f62ca36f328d3dc8d84af4402 upstream.

    The three below functions:

    smsc95xx_enter_suspend0()
    smsc95xx_enter_suspend1()
    smsc95xx_enter_suspend2()

    return > 0 in case of success, so they will cause smsc95xx_suspend()
    to return > 0 and cause suspend failure.

    The bug is introduced in commit 3b9f7d(smsc95xx: fix error handling
    in suspend failure case).

    Signed-off-by: Ming Lei <ming.lei@canonical.com>
    Cc: Steve Glendinning <steve.glendinning@shawell.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/usb/smsc95xx.c | 6 ++++++
    1 file changed, 6 insertions(+)

    --- a/drivers/net/usb/smsc95xx.c
    +++ b/drivers/net/usb/smsc95xx.c
    @@ -1340,6 +1340,8 @@ static int smsc95xx_enter_suspend0(struc
    ret = smsc95xx_read_reg_nopm(dev, PM_CTRL, &val);
    if (ret < 0)
    netdev_warn(dev->net, "Error reading PM_CTRL\n");
    + else
    + ret = 0;

    return ret;
    }
    @@ -1392,6 +1394,8 @@ static int smsc95xx_enter_suspend1(struc
    ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
    if (ret < 0)
    netdev_warn(dev->net, "Error writing PM_CTRL\n");
    + else
    + ret = 0;

    return ret;
    }
    @@ -1413,6 +1417,8 @@ static int smsc95xx_enter_suspend2(struc
    ret = smsc95xx_write_reg_nopm(dev, PM_CTRL, val);
    if (ret < 0)
    netdev_warn(dev->net, "Error writing PM_CTRL\n");
    + else
    + ret = 0;

    return ret;
    }



    \
     
     \ /
      Last update: 2013-03-13 04:42    [W:4.437 / U:0.400 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site