diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-06-13 10:24:38 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-06-13 10:24:38 +0200 |
| commit | 289733ed456f7c1cbdb1f1ca58312f77c239953b (patch) | |
| tree | 99bed0a5c21d0bdc5f6c10bc80a1ae8dbbd56be6 /drivers/net/phy/bcm63xx.c | |
| parent | OMAPDSS: fix registration of DPI and SDI devices (diff) | |
| parent | Linux 3.5-rc2 (diff) | |
| download | linux-289733ed456f7c1cbdb1f1ca58312f77c239953b.tar.xz linux-289733ed456f7c1cbdb1f1ca58312f77c239953b.zip | |
Merge tag 'v3.5-rc2'
Merge v3.5-rc2 to get latest device tree and dynamic debug changes.
Diffstat (limited to 'drivers/net/phy/bcm63xx.c')
| -rw-r--r-- | drivers/net/phy/bcm63xx.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/phy/bcm63xx.c b/drivers/net/phy/bcm63xx.c index e16f98cb4f04..cd802eb25fd2 100644 --- a/drivers/net/phy/bcm63xx.c +++ b/drivers/net/phy/bcm63xx.c @@ -39,10 +39,7 @@ static int bcm63xx_config_init(struct phy_device *phydev) MII_BCM63XX_IR_SPEED | MII_BCM63XX_IR_LINK) | MII_BCM63XX_IR_EN; - err = phy_write(phydev, MII_BCM63XX_IR, reg); - if (err < 0) - return err; - return 0; + return phy_write(phydev, MII_BCM63XX_IR, reg); } static int bcm63xx_ack_interrupt(struct phy_device *phydev) |