From 7b5683d85d247025c6fb48368f09b36204a37a0a Mon Sep 17 00:00:00 2001
From: Zdenek Styblik <zdenek.styblik@gmail.com>
Date: Thu, 10 Oct 2013 11:56:04 +0000
Subject: [PATCH] ID: 50 - ipmi_hpmfwupg needs a clean up

HpmfwupgManualFirmwareRollback() - kill one level of indentation.
---
 ipmitool/lib/ipmi_hpmfwupg.c | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/ipmitool/lib/ipmi_hpmfwupg.c b/ipmitool/lib/ipmi_hpmfwupg.c
index dd4b168..cceaf40 100644
--- a/ipmitool/lib/ipmi_hpmfwupg.c
+++ b/ipmitool/lib/ipmi_hpmfwupg.c
@@ -2083,23 +2083,22 @@ HpmfwupgManualFirmwareRollback(struct ipmi_intf *intf,
 	req.msg.data = (unsigned char*)&pCtx->req;
 	req.msg.data_len = sizeof(struct HpmfwupgManualFirmwareRollbackReq);
 	rsp = HpmfwupgSendCmd(intf, req, &fwupgCtx);
-	if (rsp) {
-		/* Long duration command handling */
-		if (rsp->ccode == IPMI_CC_OK
-				|| rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) {
-			struct HpmfwupgQueryRollbackStatusCtx resCmd;
-			printf("Waiting firmware rollback...");
-			fflush(stdout);
-			rc = HpmfwupgQueryRollbackStatus(intf, &resCmd, &fwupgCtx);
-		} else if ( rsp->ccode != 0x00 ) {
-			lprintf(LOG_NOTICE,"Error sending manual rollback");
-			lprintf(LOG_NOTICE,"compcode=0x%x: %s",  
-					rsp->ccode,
-					val2str(rsp->ccode, completion_code_vals));
-			rc = HPMFWUPG_ERROR;
-		}
-	} else {
-		lprintf(LOG_NOTICE, "Error sending manual rollback\n");
+	if (rsp == NULL) {
+		lprintf(LOG_ERR, "Error sending manual rollback.");
+		return HPMFWUPG_ERROR;
+	}
+	/* Long duration command handling */
+	if (rsp->ccode == IPMI_CC_OK
+			|| rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) {
+		struct HpmfwupgQueryRollbackStatusCtx resCmd;
+		printf("Waiting firmware rollback...");
+		fflush(stdout);
+		rc = HpmfwupgQueryRollbackStatus(intf, &resCmd, &fwupgCtx);
+	} else if ( rsp->ccode != 0x00 ) {
+		lprintf(LOG_ERR, "Error sending manual rollback");
+		lprintf(LOG_ERR, "compcode=0x%x: %s",  
+				rsp->ccode,
+				val2str(rsp->ccode, completion_code_vals));
 		rc = HPMFWUPG_ERROR;
 	}
 	return rc;