lkml.org 
[lkml]   [2017]   [Jun]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.11 004/150] net: systemport: Fix missing Wake-on-LAN interrupt for SYSTEMPORT Lite
    Date
    4.11-stable review patch.  If anyone has any objections, please let me know.

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

    From: Florian Fainelli <f.fainelli@gmail.com>


    [ Upstream commit d31353cd753c443ace5723d6878a39f393a0c136 ]

    On SYSTEMPORT Lite, since we have the main interrupt source in the first
    cell, the second cell is the Wake-on-LAN interrupt, yet the code was not
    properly updated to fetch the second cell, and instead looked at the
    third and non-existing cell for Wake-on-LAN.

    Fixes: 44a4524c54af ("net: systemport: Add support for SYSTEMPORT Lite")
    Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/broadcom/bcmsysport.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    --- a/drivers/net/ethernet/broadcom/bcmsysport.c
    +++ b/drivers/net/ethernet/broadcom/bcmsysport.c
    @@ -1968,9 +1968,12 @@ static int bcm_sysport_probe(struct plat
    priv->num_rx_desc_words = params->num_rx_desc_words;

    priv->irq0 = platform_get_irq(pdev, 0);
    - if (!priv->is_lite)
    + if (!priv->is_lite) {
    priv->irq1 = platform_get_irq(pdev, 1);
    - priv->wol_irq = platform_get_irq(pdev, 2);
    + priv->wol_irq = platform_get_irq(pdev, 2);
    + } else {
    + priv->wol_irq = platform_get_irq(pdev, 1);
    + }
    if (priv->irq0 <= 0 || (priv->irq1 <= 0 && !priv->is_lite)) {
    dev_err(&pdev->dev, "invalid interrupts\n");
    ret = -EINVAL;

    \
     
     \ /
      Last update: 2017-06-12 20:57    [W:5.067 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site