diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/dsa/slave.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 188b69773e70..6511552039d6 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c | |||
| @@ -675,7 +675,8 @@ static int dsa_slave_phy_setup(struct dsa_slave_priv *p, | |||
| 675 | * want to bind this device using the slave MII bus created by | 675 | * want to bind this device using the slave MII bus created by |
| 676 | * DSA to make that happen. | 676 | * DSA to make that happen. |
| 677 | */ | 677 | */ |
| 678 | if (ret >= 0 && (ds->phys_mii_mask & (1 << ret))) { | 678 | if (!phy_is_fixed && ret >= 0 && |
| 679 | (ds->phys_mii_mask & (1 << ret))) { | ||
| 679 | ret = dsa_slave_phy_connect(p, slave_dev, ret); | 680 | ret = dsa_slave_phy_connect(p, slave_dev, ret); |
| 680 | if (ret) | 681 | if (ret) |
| 681 | return ret; | 682 | return ret; |