diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-09-29 12:52:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-09-29 12:52:07 +0200 |
| commit | d8dfacf8b50c260d79864933ac82a8198a0908a9 (patch) | |
| tree | b172eb8643de7bd9f9439c58031b06c98116d86a /drivers/net/dsa/mv88e6xxx.c | |
| parent | e87359efcaf45efc41dbaa6ec25eb26705300cee (diff) | |
| parent | df075feefbd347f13fba5198294cda619532c237 (diff) | |
| download | talos-obmc-linux-d8dfacf8b50c260d79864933ac82a8198a0908a9.tar.gz talos-obmc-linux-d8dfacf8b50c260d79864933ac82a8198a0908a9.zip | |
Merge branch 'topic/firewire-update' into for-next
Diffstat (limited to 'drivers/net/dsa/mv88e6xxx.c')
| -rw-r--r-- | drivers/net/dsa/mv88e6xxx.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/dsa/mv88e6xxx.c b/drivers/net/dsa/mv88e6xxx.c index 6f13f7206762..f8baa897d1a0 100644 --- a/drivers/net/dsa/mv88e6xxx.c +++ b/drivers/net/dsa/mv88e6xxx.c @@ -2000,6 +2000,7 @@ static int mv88e6xxx_setup_port(struct dsa_switch *ds, int port) */ reg = _mv88e6xxx_reg_read(ds, REG_PORT(port), PORT_PCS_CTRL); if (dsa_is_cpu_port(ds, port) || dsa_is_dsa_port(ds, port)) { + reg &= ~PORT_PCS_CTRL_UNFORCED; reg |= PORT_PCS_CTRL_FORCE_LINK | PORT_PCS_CTRL_LINK_UP | PORT_PCS_CTRL_DUPLEX_FULL | |
