lkml.org 
[lkml]   [2018]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 18/97] lan78xx: Correctly indicate invalid OTP
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Phil Elwell <phil@raspberrypi.org>


    [ Upstream commit 4bfc33807a9a02764bdd1e42e794b3b401240f27 ]

    lan78xx_read_otp tries to return -EINVAL in the event of invalid OTP
    content, but the value gets overwritten before it is returned and the
    read goes ahead anyway. Make the read conditional as it should be
    and preserve the error code.

    Fixes: 55d7de9de6c3 ("Microchip's LAN7800 family USB 2/3 to 10/100/1000 Ethernet device driver")
    Signed-off-by: Phil Elwell <phil@raspberrypi.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/usb/lan78xx.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/net/usb/lan78xx.c
    +++ b/drivers/net/usb/lan78xx.c
    @@ -618,7 +618,8 @@ static int lan78xx_read_otp(struct lan78
    offset += 0x100;
    else
    ret = -EINVAL;
    - ret = lan78xx_read_raw_otp(dev, offset, length, data);
    + if (!ret)
    + ret = lan78xx_read_raw_otp(dev, offset, length, data);
    }

    return ret;

    \
     
     \ /
      Last update: 2018-04-22 16:49    [W:4.557 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site