* [PATCH 1/3] Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.
@ 2012-03-28 8:05 Kenth Eriksson
2012-04-01 20:16 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Kenth Eriksson @ 2012-03-28 8:05 UTC (permalink / raw)
To: netdev; +Cc: Kenth Eriksson
Commit b26e478f undid bug fix in commit c3e072f8, with the result that non TBI (e.g. MDIO) PHYs cannot be accessed.
Signed-off-by: Kenth Eriksson <kenth.eriksson@transmode.com>
---
drivers/net/ethernet/freescale/fsl_pq_mdio.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fsl_pq_mdio.c b/drivers/net/ethernet/freescale/fsl_pq_mdio.c
index 9eb8159..f7f0bf5 100644
--- 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 platform_device *ofdev)
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);
--
1.7.3.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/3] Fix non TBI PHY access; a bad merge undid bug fix in a previous commit.
2012-03-28 8:05 [PATCH 1/3] Fix non TBI PHY access; a bad merge undid bug fix in a previous commit Kenth Eriksson
@ 2012-04-01 20:16 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-04-01 20:16 UTC (permalink / raw)
To: kenth.eriksson; +Cc: netdev
From: Kenth Eriksson <kenth.eriksson@transmode.com>
Date: Wed, 28 Mar 2012 10:05:54 +0200
> Commit b26e478f undid bug fix in commit c3e072f8, with the result
> that non TBI (e.g. MDIO) PHYs cannot be accessed.
>
> Signed-off-by: Kenth Eriksson <kenth.eriksson@transmode.com>
Applied and queued up for -stable.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-01 20:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-28 8:05 [PATCH 1/3] Fix non TBI PHY access; a bad merge undid bug fix in a previous commit Kenth Eriksson
2012-04-01 20:16 ` David Miller
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.