diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-02-23 17:05:56 -0500 |
| commit | dc731ca60954310be0993e8992d450c7089fd13d (patch) | |
| tree | 6a997916f963d9e6dfa76fc5564296f57c3f909e /drivers/net/phy/mdio-gpio.c | |
| parent | ec5b3d32437571b8a742069a4cfd04edb6b6eda5 (diff) | |
| parent | 20f4d6c3a2a23c5d7d9cc7f42fbb943ca7a03d1f (diff) | |
Merge branch 'x86/urgent' into x86/mce2
Diffstat (limited to 'drivers/net/phy/mdio-gpio.c')
| -rw-r--r-- | drivers/net/phy/mdio-gpio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c index a439ebeb4319..af28ff7ae176 100644 --- a/drivers/net/phy/mdio-gpio.c +++ b/drivers/net/phy/mdio-gpio.c | |||
| @@ -125,6 +125,8 @@ static int __devinit mdio_gpio_bus_init(struct device *dev, | |||
| 125 | if (gpio_request(bitbang->mdio, "mdio")) | 125 | if (gpio_request(bitbang->mdio, "mdio")) |
| 126 | goto out_free_mdc; | 126 | goto out_free_mdc; |
| 127 | 127 | ||
| 128 | gpio_direction_output(bitbang->mdc, 0); | ||
| 129 | |||
| 128 | dev_set_drvdata(dev, new_bus); | 130 | dev_set_drvdata(dev, new_bus); |
| 129 | 131 | ||
| 130 | ret = mdiobus_register(new_bus); | 132 | ret = mdiobus_register(new_bus); |