target/linux/brcm47xx/patches-3.10/207-b44-do-not-set-phy-addr-to-30-for-every-ext-phy.patch

   1 From c2ecc401a08f0bda3b2483b93989d9792cadf6b2 Mon Sep 17 00:00:00 2001
   2 From: Hauke Mehrtens <hauke@hauke-m.de>
   3 Date: Mon, 21 Oct 2013 20:30:04 +0200
   4 Subject: [PATCH 8/9] b44: do not set phy addr to 30 for every ext phy
   5
   6 ---
   7  drivers/net/ethernet/broadcom/b44.c |    7 +++++--
   8  1 file changed, 5 insertions(+), 2 deletions(-)
   9
  10 --- a/drivers/net/ethernet/broadcom/b44.c
  11 +++ b/drivers/net/ethernet/broadcom/b44.c
  12 @@ -2408,8 +2408,11 @@ static int b44_init_one(struct ssb_devic
  13         b44_chip_reset(bp, B44_CHIP_RESET_FULL);
  14
  15         /* do a phy reset to test if there is an active phy */
  16 -       if (b44_phy_reset(bp) < 0)
  17 -               bp->phy_addr = B44_PHY_ADDR_NO_LOACL_PHY;
  18 +       err = b44_phy_reset(bp);
  19 +       if (err < 0) {
  20 +               dev_err(sdev->dev, "phy reset failed\n");
  21 +               goto err_out_unregister_netdev;
  22 +       }
  23
  24         if (bp->flags & B44_FLAG_EXTERNAL_PHY) {
  25                 err = b44_register_phy_one(bp);