summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaleb Palmer <cnpalmer@us.ibm.com>2018-01-02 14:32:47 -0600
committerZane C. Shelley <zshelle@us.ibm.com>2018-01-11 17:19:30 -0500
commitaa5e361a94c96045bbeaa90462640e5ae43807ed (patch)
tree45a93a47dbd00f38bee4765b48f30532a7d994fc
parent2a032fa76a4ec61eb15d3381b7bf5000368589d2 (diff)
downloadtalos-hostboot-aa5e361a94c96045bbeaa90462640e5ae43807ed.tar.gz
talos-hostboot-aa5e361a94c96045bbeaa90462640e5ae43807ed.zip
MDIA: Fix overwriting rc from restoreDramRepairs
Change-Id: I69c991e83d4337b14a7ea209dffcaada17d0b6f7 CQ: SW411760 Backport: release-op910 Backport: release-fips910 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/51366 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com> Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
-rw-r--r--src/usr/diag/mdia/mdiasm.C4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/usr/diag/mdia/mdiasm.C b/src/usr/diag/mdia/mdiasm.C
index a946c2bda..00fe86f82 100644
--- a/src/usr/diag/mdia/mdiasm.C
+++ b/src/usr/diag/mdia/mdiasm.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2017 */
+/* Contributors Listed Below - COPYRIGHT 2012,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -918,7 +918,7 @@ bool StateMachine::executeWorkItem(WorkFlowProperties * i_wfp)
{
MDIA_SLOW( "sm: restoreDramRepairs(0x%08x)",
get_huid(mca) );
- rc = PRDF::restoreDramRepairs<TYPE_MCA>( mca );
+ rc |= PRDF::restoreDramRepairs<TYPE_MCA>( mca );
}
}
OpenPOWER on IntegriCloud