| 1 | --- a/drivers/net/b44.c |
| 2 | +++ b/drivers/net/b44.c |
| 3 | @@ -339,7 +339,7 @@ static int b44_phy_reset(struct b44 *bp) |
| 4 | } |
| 5 | } |
| 6 | |
| 7 | - return 0; |
| 8 | + return err; |
| 9 | } |
| 10 | |
| 11 | static void __b44_set_flow_ctrl(struct b44 *bp, u32 pause_flags) |
| 12 | @@ -2223,6 +2223,10 @@ static int __devinit b44_init_one(struct |
| 13 | */ |
| 14 | b44_chip_reset(bp, B44_CHIP_RESET_FULL); |
| 15 | |
| 16 | + /* do a phy reset to test if there is an active phy */ |
| 17 | + if (b44_phy_reset(bp) < 0) |
| 18 | + bp->phy_addr = B44_PHY_ADDR_NO_PHY; |
| 19 | + |
| 20 | printk(KERN_INFO "%s: Broadcom 44xx/47xx 10/100BaseT Ethernet %pM\n", |
| 21 | dev->name, dev->dev_addr); |
| 22 | |
| 23 | |
