| 12345678910111213141516171819202122 |
- --- a/drivers/net/b44.c
- +++ b/drivers/net/b44.c
- @@ -339,7 +339,7 @@ static int b44_phy_reset(struct b44 *bp)
- }
- }
-
- - return 0;
- + return err;
- }
-
- static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags)
- @@ -2220,6 +2220,10 @@ static int __devinit b44_init_one(struct
- */
- b44_chip_reset(bp, B44_CHIP_RESET_FULL);
-
- + /* do a phy reset to test if there is an active phy */
- + if (b44_phy_reset(bp) < 0)
- + bp->phy_addr = B44_PHY_ADDR_NO_PHY;
- +
- printk(KERN_INFO "%s: Broadcom 44xx/47xx 10/100BaseT Ethernet %pM\n",
- dev->name, dev->dev_addr);
-
|
