Commit 56ace3a0 authored by Kalesh AP's avatar Kalesh AP Committed by David S. Miller

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: default avatarKalesh AP <kalesh.purayil@emulex.com>
Signed-off-by: default avatarSathya Perla <sathya.perla@emulex.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 940a3fcd
...@@ -3956,7 +3956,7 @@ static int be_flash_skyhawk(struct be_adapter *adapter, ...@@ -3956,7 +3956,7 @@ static int be_flash_skyhawk(struct be_adapter *adapter,
fsec = get_fsec_info(adapter, filehdr_size + img_hdrs_size, fw); fsec = get_fsec_info(adapter, filehdr_size + img_hdrs_size, fw);
if (!fsec) { if (!fsec) {
dev_err(dev, "Invalid Cookie. FW image may be corrupted\n"); dev_err(dev, "Invalid Cookie. FW image may be corrupted\n");
return -1; return -EINVAL;
} }
for (i = 0; i < le32_to_cpu(fsec->fsec_hdr.num_images); i++) { 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,7 +4187,7 @@ static int be_fw_download(struct be_adapter *adapter, const struct firmware* fw)
&flash_cmd, &flash_cmd,
num_imgs); num_imgs);
else { else {
status = -1; status = -EINVAL;
dev_err(&adapter->pdev->dev, dev_err(&adapter->pdev->dev,
"Can't load BE3 UFI on BE3R\n"); "Can't load BE3 UFI on BE3R\n");
} }
...@@ -4198,7 +4198,7 @@ static int be_fw_download(struct be_adapter *adapter, const struct firmware* fw) ...@@ -4198,7 +4198,7 @@ static int be_fw_download(struct be_adapter *adapter, const struct firmware* fw)
if (ufi_type == UFI_TYPE2) if (ufi_type == UFI_TYPE2)
status = be_flash_BEx(adapter, fw, &flash_cmd, 0); status = be_flash_BEx(adapter, fw, &flash_cmd, 0);
else if (ufi_type == -1) else if (ufi_type == -1)
status = -1; status = -EINVAL;
dma_free_coherent(&adapter->pdev->dev, flash_cmd.size, flash_cmd.va, dma_free_coherent(&adapter->pdev->dev, flash_cmd.size, flash_cmd.va,
flash_cmd.dma); flash_cmd.dma);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment