Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 656a7c2b authored by Hauke Mehrtens's avatar Hauke Mehrtens Committed by David S. Miller
Browse files

b44: do not set PHY address to 30 for every ext PHY 



b44_phy_reset() will fail for an external PHY and only work with the
internal PHY, this was an old workaround when the detection of an
external switch based on the PHY address failed and it is not needed
any more.

Signed-off-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bea69c47

drivers/net/ethernet/broadcom/b44.c

+5 −2
Original line number Diff line number Diff line
@@ -2412,8 +2412,11 @@ static int b44_init_one(struct ssb_device *sdev, 
	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_LOCAL_PHY;

	err = b44_phy_reset(bp);

	if (err < 0) {

		dev_err(sdev->dev, "phy reset failed\n");

		goto err_out_unregister_netdev;

	}



	if (bp->flags & B44_FLAG_EXTERNAL_PHY) {

		err = b44_register_phy_one(bp);