diff options
author | Divy Le Ray <divy@chelsio.com> | 2009-05-20 11:56:12 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-20 23:51:59 -0400 |
commit | 703cebabd173a7fe533d6f21df0347b1f2a9a1e1 (patch) | |
tree | cea9c6a7b8b5a4e733a3b2d6366cdcbbfedc8f49 /drivers/net/chelsio/my3126.c | |
parent | 86c890ab1b183f8f17ce03c24b62c564e95f957f (diff) |
cxgb: set phy's mdio dev before the phy init sequence
mdio's dev field needs to be set before mdio ops occur.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/chelsio/my3126.c')
-rw-r--r-- | drivers/net/chelsio/my3126.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/chelsio/my3126.c b/drivers/net/chelsio/my3126.c index 977c7e08b0e0..4c6028512d10 100644 --- a/drivers/net/chelsio/my3126.c +++ b/drivers/net/chelsio/my3126.c | |||
@@ -167,7 +167,7 @@ static struct cphy_ops my3126_ops = { | |||
167 | MDIO_DEVS_PHYXS), | 167 | MDIO_DEVS_PHYXS), |
168 | }; | 168 | }; |
169 | 169 | ||
170 | static struct cphy *my3126_phy_create(adapter_t *adapter, | 170 | static struct cphy *my3126_phy_create(struct net_device *dev, |
171 | int phy_addr, const struct mdio_ops *mdio_ops) | 171 | int phy_addr, const struct mdio_ops *mdio_ops) |
172 | { | 172 | { |
173 | struct cphy *cphy = kzalloc(sizeof (*cphy), GFP_KERNEL); | 173 | struct cphy *cphy = kzalloc(sizeof (*cphy), GFP_KERNEL); |
@@ -175,7 +175,7 @@ static struct cphy *my3126_phy_create(adapter_t *adapter, | |||
175 | if (!cphy) | 175 | if (!cphy) |
176 | return NULL; | 176 | return NULL; |
177 | 177 | ||
178 | cphy_init(cphy, adapter, phy_addr, &my3126_ops, mdio_ops); | 178 | cphy_init(cphy, dev, phy_addr, &my3126_ops, mdio_ops); |
179 | INIT_DELAYED_WORK(&cphy->phy_update, my3216_poll); | 179 | INIT_DELAYED_WORK(&cphy->phy_update, my3216_poll); |
180 | cphy->bmsr = 0; | 180 | cphy->bmsr = 0; |
181 | 181 | ||