diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-02-20 02:12:42 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2016-02-20 02:12:42 +0100 |
| commit | a61a5992cefc2204a99f25b2395b108092098e2c (patch) | |
| tree | 3b25da535866adf0458f6d172fd242fc933c77db /lib/ipmi_fwum.c | |
| parent | 15edf42f095e3cc26e372547ebcaaae558d0cce2 (diff) | |
| parent | 97d6a2e491c6ed08473beb2c4bac47c5cbc1201a (diff) | |
Merge tag 'upstream/1.8.16'
Upstream version 1.8.16
Diffstat (limited to 'lib/ipmi_fwum.c')
| -rw-r--r-- | lib/ipmi_fwum.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/ipmi_fwum.c b/lib/ipmi_fwum.c index 68f40d4..d1e3f4f 100644 --- a/lib/ipmi_fwum.c +++ b/lib/ipmi_fwum.c @@ -571,7 +571,7 @@ KfwumGetDeviceInfo(struct ipmi_intf *intf, unsigned char output, pGetDevId->fw_rev1, pGetDevId->fw_rev2 >> 4, pGetDevId->fw_rev2 & 0x0f); if (((pBoardInfo->iana == IPMI_OEM_KONTRON) - && (pBoardInfo->boardId = KFWUM_BOARD_KONTRON_5002))) { + && (pBoardInfo->boardId == KFWUM_BOARD_KONTRON_5002))) { printf(" SDR %u", pGetDevId->aux_fw_rev[0]); } printf("\n"); @@ -837,11 +837,8 @@ KfwumFinishFirmwareImage(struct ipmi_intf *intf, tKFWUM_InFirmwareInfo firmInfo) do { rsp = intf->sendrecv(intf, &req); } while (rsp == NULL || rsp->ccode == 0xc0); - if (!rsp) { - lprintf(LOG_ERR, - "Error in FWUM Firmware Finish Firmware Image Download Command."); - return (-1); - } else if (rsp->ccode != 0) { + + if (rsp->ccode != 0) { lprintf(LOG_ERR, "FWUM Firmware Finish Firmware Image Download returned %x", rsp->ccode); @@ -861,7 +858,6 @@ KfwumUploadFirmware(struct ipmi_intf *intf, unsigned char *pBuffer, unsigned long lastAddress = 0; unsigned char sequenceNumber = 0; unsigned char retry = FWUM_MAX_UPLOAD_RETRY; - unsigned char isLengthValid = 1; do { writeSize = save_fw_nfo.bufferSize - save_fw_nfo.overheadSize; /* Reach the end */ |