summaryrefslogtreecommitdiff
path: root/drivers/net/phy/sfp-bus.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2018-05-15 16:30:17 +0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2018-05-15 16:30:17 +0300
commit291c161f6c65530092903fbea58eb07a62b220ba (patch)
tree5b2186b7e7faf257e7184348f0217060de09ce88 /drivers/net/phy/sfp-bus.c
parenteaeb1f4d892936133c5f8d3aafb36b7f384fe59c (diff)
parentf3903c9161f0d636a7b0ff03841628928457e64c (diff)
downloadlinux-291c161f6c65530092903fbea58eb07a62b220ba.tar.xz
Merge remote-tracking branch 'tip/perf/urgent' into perf/core
To pick up fixes, notably the revert for the intel_pt//u regression. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'drivers/net/phy/sfp-bus.c')
-rw-r--r--drivers/net/phy/sfp-bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/sfp-bus.c b/drivers/net/phy/sfp-bus.c
index 0381da78d228..fd6c23f69c2f 100644
--- a/drivers/net/phy/sfp-bus.c
+++ b/drivers/net/phy/sfp-bus.c
@@ -125,7 +125,7 @@ void sfp_parse_support(struct sfp_bus *bus, const struct sfp_eeprom_id *id,
if (id->base.br_nominal) {
if (id->base.br_nominal != 255) {
br_nom = id->base.br_nominal * 100;
- br_min = br_nom + id->base.br_nominal * id->ext.br_min;
+ br_min = br_nom - id->base.br_nominal * id->ext.br_min;
br_max = br_nom + id->base.br_nominal * id->ext.br_max;
} else if (id->ext.br_max) {
br_nom = 250 * id->ext.br_max;