diff options
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
-rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 9e8727c5eced..2847f947499d 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
@@ -958,21 +958,22 @@ release_tpsram: | |||
958 | static int cxgb_up(struct adapter *adap) | 958 | static int cxgb_up(struct adapter *adap) |
959 | { | 959 | { |
960 | int err; | 960 | int err; |
961 | int must_load; | ||
962 | 961 | ||
963 | if (!(adap->flags & FULL_INIT_DONE)) { | 962 | if (!(adap->flags & FULL_INIT_DONE)) { |
964 | err = t3_check_fw_version(adap, &must_load); | 963 | err = t3_check_fw_version(adap); |
965 | if (err == -EINVAL) { | 964 | if (err == -EINVAL) { |
966 | err = upgrade_fw(adap); | 965 | err = upgrade_fw(adap); |
967 | if (err && must_load) | 966 | CH_WARN(adap, "FW upgrade to %d.%d.%d %s\n", |
968 | goto out; | 967 | FW_VERSION_MAJOR, FW_VERSION_MINOR, |
968 | FW_VERSION_MICRO, err ? "failed" : "succeeded"); | ||
969 | } | 969 | } |
970 | 970 | ||
971 | err = t3_check_tpsram_version(adap, &must_load); | 971 | err = t3_check_tpsram_version(adap); |
972 | if (err == -EINVAL) { | 972 | if (err == -EINVAL) { |
973 | err = update_tpsram(adap); | 973 | err = update_tpsram(adap); |
974 | if (err && must_load) | 974 | CH_WARN(adap, "TP upgrade to %d.%d.%d %s\n", |
975 | goto out; | 975 | TP_VERSION_MAJOR, TP_VERSION_MINOR, |
976 | TP_VERSION_MICRO, err ? "failed" : "succeeded"); | ||
976 | } | 977 | } |
977 | 978 | ||
978 | /* | 979 | /* |