diff options
author | Kalesh AP <kalesh.purayil@emulex.com> | 2014-07-17 06:50:20 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-07-17 19:38:14 -0400 |
commit | 56ace3a0d0209ea9f1806abb9c1046fdb89e0030 (patch) | |
tree | 8d368e70377693bbd08ed57f2bc5ec7f794183bd | |
parent | 940a3fcddc76f82ac4e80dfa7bccb236e9bec0a1 (diff) |
be2net: fix error status for FW-download
For FW download ethtool cmd, if the user provides an FW-image incompatible
with the chip, return -EINVAL instead of -1.
Signed-off-by: Kalesh AP <kalesh.purayil@emulex.com>
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c index 4388833f31d9..1f3daee5edc3 100644 --- a/drivers/net/ethernet/emulex/benet/be_main.c +++ b/drivers/net/ethernet/emulex/benet/be_main.c | |||
@@ -3956,7 +3956,7 @@ static int be_flash_skyhawk(struct be_adapter *adapter, | |||
3956 | fsec = get_fsec_info(adapter, filehdr_size + img_hdrs_size, fw); | 3956 | fsec = get_fsec_info(adapter, filehdr_size + img_hdrs_size, fw); |
3957 | if (!fsec) { | 3957 | if (!fsec) { |
3958 | dev_err(dev, "Invalid Cookie. FW image may be corrupted\n"); | 3958 | dev_err(dev, "Invalid Cookie. FW image may be corrupted\n"); |
3959 | return -1; | 3959 | return -EINVAL; |
3960 | } | 3960 | } |
3961 | 3961 | ||
3962 | for (i = 0; i < le32_to_cpu(fsec->fsec_hdr.num_images); i++) { | 3962 | for (i = 0; i < le32_to_cpu(fsec->fsec_hdr.num_images); i++) { |
@@ -4187,7 +4187,7 @@ static int be_fw_download(struct be_adapter *adapter, const struct firmware* fw) | |||
4187 | &flash_cmd, | 4187 | &flash_cmd, |
4188 | num_imgs); | 4188 | num_imgs); |
4189 | else { | 4189 | else { |
4190 | status = -1; | 4190 | status = -EINVAL; |
4191 | dev_err(&adapter->pdev->dev, | 4191 | dev_err(&adapter->pdev->dev, |
4192 | "Can't load BE3 UFI on BE3R\n"); | 4192 | "Can't load BE3 UFI on BE3R\n"); |
4193 | } | 4193 | } |
@@ -4198,7 +4198,7 @@ static int be_fw_download(struct be_adapter *adapter, const struct firmware* fw) | |||
4198 | if (ufi_type == UFI_TYPE2) | 4198 | if (ufi_type == UFI_TYPE2) |
4199 | status = be_flash_BEx(adapter, fw, &flash_cmd, 0); | 4199 | status = be_flash_BEx(adapter, fw, &flash_cmd, 0); |
4200 | else if (ufi_type == -1) | 4200 | else if (ufi_type == -1) |
4201 | status = -1; | 4201 | status = -EINVAL; |
4202 | 4202 | ||
4203 | dma_free_coherent(&adapter->pdev->dev, flash_cmd.size, flash_cmd.va, | 4203 | dma_free_coherent(&adapter->pdev->dev, flash_cmd.size, flash_cmd.va, |
4204 | flash_cmd.dma); | 4204 | flash_cmd.dma); |