From 17fa4219de80ff31a7f569618997a103817cba2c Mon Sep 17 00:00:00 2001 From: Valentine Barshak Date: Wed, 5 Dec 2007 11:14:31 +1100 Subject: [PATCH] --- yaml --- r: 74733 b: refs/heads/master c: 63b6cad795e0a34e8670291943df8a6f653c1931 h: refs/heads/master i: 74731: baaea5ec16dcfad4e4b25b7dbc0deb53523208f7 v: v3 --- [refs] | 2 +- trunk/drivers/net/ibm_newemac/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 231214e77956..49cb94770c4b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4696c3c406a8b32112f8e1f70b3db1114950dcb1 +refs/heads/master: 63b6cad795e0a34e8670291943df8a6f653c1931 diff --git a/trunk/drivers/net/ibm_newemac/core.c b/trunk/drivers/net/ibm_newemac/core.c index 9642931c66ea..7a620e5aaf38 100644 --- a/trunk/drivers/net/ibm_newemac/core.c +++ b/trunk/drivers/net/ibm_newemac/core.c @@ -2442,7 +2442,7 @@ static int __devinit emac_init_config(struct emac_instance *dev) if (emac_read_uint_prop(np, "tah-device", &dev->tah_ph, 0)) dev->tah_ph = 0; if (emac_read_uint_prop(np, "tah-channel", &dev->tah_port, 0)) - dev->tah_ph = 0; + dev->tah_port = 0; if (emac_read_uint_prop(np, "mdio-device", &dev->mdio_ph, 0)) dev->mdio_ph = 0; if (emac_read_uint_prop(np, "zmii-device", &dev->zmii_ph, 0))