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)
committerLuis Henriques <luis.henriques@canonical.com>
Mon, 30 Apr 2012 18:14:58 +0000 (19:14 +0100)
commit094c3849e25787b97c155eefb2e4134a6e96fcc3
tree7739b050d89e2a29a2a753e86a6d3a82057fa955
parentd9632b0819193cca3fdaec6122a7abbc39e6575e
Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.

BugLink: http://bugs.launchpad.net/bugs/981162

[ 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>
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
drivers/net/ethernet/freescale/fsl_pq_mdio.c