You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.2 KiB
33 lines
1.2 KiB
11 years ago
|
From 656a7c2b1210deddf76444ecc76e058c0404ce80 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
||
|
|
Date: Fri, 20 Dec 2013 02:16:12 +0100
|
||
|
|
Subject: [PATCH 207/208] 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: Hauke Mehrtens <hauke@hauke-m.de>
|
||
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/broadcom/b44.c | 7 +++++--
|
||
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/net/ethernet/broadcom/b44.c
|
||
|
|
+++ b/drivers/net/ethernet/broadcom/b44.c
|
||
|
|
@@ -2413,8 +2413,11 @@ static int b44_init_one(struct ssb_devic
|
||
|
|
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);
|