This is a note to let you know that I've just added the patch titled
Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.
to the 3.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
fix-non-tbi-phy-access-a-bad-merge-undid-bug-fix-in-a-previous-commit.patch
and it can be found in the queue-3.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From 89fd9ec230fe9c944c1dbaa8bce663bbab925b08 Mon Sep 17 00:00:00 2001
From: Kenth Eriksson <[email protected]>
Date: Tue, 27 Mar 2012 22:05:54 +0000
Subject: Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.
From: Kenth Eriksson <[email protected]>
[ 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 <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/net/ethernet/freescale/fsl_pq_mdio.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
--- a/drivers/net/ethernet/freescale/fsl_pq_mdio.c
+++ b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
@@ -356,16 +356,15 @@ static int fsl_pq_mdio_probe(struct plat
if (prop)
tbiaddr = *prop;
- }
-
- if (tbiaddr == -1) {
- err = -EBUSY;
- goto err_free_irqs;
+ if (tbiaddr == -1) {
+ err = -EBUSY;
+ goto err_free_irqs;
+ } else {
+ out_be32(tbipa, tbiaddr);
+ }
}
- out_be32(tbipa, tbiaddr);
-
err = of_mdiobus_register(new_bus, np);
if (err) {
printk (KERN_ERR "%s: Cannot register as MDIO bus\n",
Patches currently in stable-queue which might be from
[email protected] are
queue-3.2/fix-non-tbi-phy-access-a-bad-merge-undid-bug-fix-in-a-previous-commit.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
