diff options
| author | Brian Horton <brianh@linux.ibm.com> | 2015-04-16 06:04:36 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-05-01 15:50:21 -0500 |
| commit | f5ead81c7cbc2223366b0039bd311d050ca358d5 (patch) | |
| tree | e7964a2be2356aa73686689598f6c85d41102e7e /src/usr/hwas | |
| parent | cb4f271c1e16ce8ac16633757abf9b4526eafefe (diff) | |
| download | talos-hostboot-f5ead81c7cbc2223366b0039bd311d050ca358d5.tar.gz talos-hostboot-f5ead81c7cbc2223366b0039bd311d050ca358d5.zip | |
correct logic bug in deconfig code
Change-Id: Ic44b4a7a334e8e45a72fe17632e6afbaa64c3724
CQ: SW303638
Backport: release-fips830
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/17201
Tested-by: Jenkins Server
Reviewed-by: Dhruvaraj Subhashchandran <dhruvaraj@in.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwas')
| -rw-r--r-- | src/usr/hwas/common/deconfigGard.C | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/usr/hwas/common/deconfigGard.C b/src/usr/hwas/common/deconfigGard.C index aa3552c10..5a06dd3bf 100644 --- a/src/usr/hwas/common/deconfigGard.C +++ b/src/usr/hwas/common/deconfigGard.C @@ -1384,7 +1384,7 @@ void DeconfigGard::_deconfigureByAssoc( const Target *l_partnerMcs = findPartnerForMcs(l_parentMcs); // If partner MCS is functional or not spec deconfigured - if ((l_partnerMcs)&&(isFunctional(l_partnerMcs))) + if (l_partnerMcs && isFunctional(l_partnerMcs)) { // deconfigure the paired MCS HWAS_INF("_deconfigureByAssoc MCS (& MEMBUF) paired: %.8X", @@ -1469,7 +1469,7 @@ void DeconfigGard::_deconfigureByAssoc( // If partner MCS is non-functional // (findPartnerForMcs returned NULL) or speculated deconfig - if ((!l_partnerMcs)&&(!isFunctional(l_partnerMcs))) + if (!(l_partnerMcs && isFunctional(l_partnerMcs))) { // We're done. break; @@ -1742,7 +1742,7 @@ void DeconfigGard::_deconfigureTarget( } // Do any necessary Deconfigure Actions - _doDeconfigureActions(i_target); + _doDeconfigureActions(i_target); /*no effect*/ // to quiet BEAM // If target being deconfigured is an x/a bus endpoint if ((TYPE_XBUS == i_target.getAttr<ATTR_TYPE>()) || (TYPE_ABUS == i_target.getAttr<ATTR_TYPE>())) |
