Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.
authorKenth Eriksson <kenth.eriksson@transmode.com>
Tue, 27 Mar 2012 22:05:54 +0000 (22:05 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 13 Apr 2012 15:33:45 +0000 (08:33 -0700)
commit127241bd9ae2771020b24c4537ee1219f823c45f
treebf20b46aaca00eb961e19ddf6d8d769fc7bc1c4d
parent0ccef2bfa30d6b6e4cc9674b9dca3b26d1517e33
Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.

[ 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