lkml.org 
[lkml]   [2012]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 07/78] Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.
    3.3-stable review patch.  If anyone has any objections, please let me know.

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


    From: Kenth Eriksson <kenth.eriksson@transmode.com>

    [ Upstream commit 464b57da56910c8737ede75ad820b9a7afc46b3e ]

    The merge done in commit b26e478f undid bug fix in commit c3e072f8
    ("net: fsl_pq_mdio: fix non tbi phy access"), with the result that non
    TBI (e.g. MDIO) PHYs cannot be accessed.

    Signed-off-by: Kenth Eriksson <kenth.eriksson@transmode.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/ethernet/freescale/fsl_pq_mdio.c | 12 ++++++------
    1 file changed, 6 insertions(+), 6 deletions(-)

    --- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c
    +++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
    @@ -356,13 +356,13 @@ static int fsl_pq_mdio_probe(struct plat

    if (prop)
    tbiaddr = *prop;
    - }

    - if (tbiaddr == -1) {
    - err = -EBUSY;
    - goto err_free_irqs;
    - } else {
    - out_be32(tbipa, tbiaddr);
    + if (tbiaddr == -1) {
    + err = -EBUSY;
    + goto err_free_irqs;
    + } else {
    + out_be32(tbipa, tbiaddr);
    + }
    }

    err = of_mdiobus_register(new_bus, np);



    \
     
     \ /
      Last update: 2012-04-12 01:17    [W:0.021 / U:93.108 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site