diff options
| author | Praveen Madhavan <praveenm@chelsio.com> | 2015-02-03 14:48:26 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-05 01:00:30 +0300 |
| commit | 541c571fa2fdfd4782d840276c5aedb535349075 (patch) | |
| tree | e9132683265f26a31b4e501396be6c0784df8953 /drivers/scsi/csiostor/csio_hw.c | |
| parent | b5057dd79c2db9a2be5306fdcdb2eae5c9c0e109 (diff) | |
| download | linux-541c571fa2fdfd4782d840276c5aedb535349075.tar.xz | |
csiostor:Use firmware version from cxgb4/t4fw_version.h
This patch is to use firmware version macros from t4fw_version.h
and also enables 40g T5 adapter.
Signed-off-by: Praveen Madhavan <praveenm@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/csiostor/csio_hw.c')
| -rw-r--r-- | drivers/scsi/csiostor/csio_hw.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/csiostor/csio_hw.c b/drivers/scsi/csiostor/csio_hw.c index c81b06bcf827..2e66f34ebb79 100644 --- a/drivers/scsi/csiostor/csio_hw.c +++ b/drivers/scsi/csiostor/csio_hw.c @@ -1372,7 +1372,8 @@ csio_config_device_caps(struct csio_hw *hw) } /* Validate device capabilities */ - if (csio_hw_validate_caps(hw, mbp)) + rv = csio_hw_validate_caps(hw, mbp); + if (rv != 0) goto out; /* Don't config device capabilities if already configured */ @@ -1776,7 +1777,8 @@ csio_hw_use_fwconfig(struct csio_hw *hw, int reset, u32 *fw_cfg_param) } /* Validate device capabilities */ - if (csio_hw_validate_caps(hw, mbp)) + rv = csio_hw_validate_caps(hw, mbp); + if (rv != 0) goto bye; /* * Note that we're operating with parameters |