summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Phan <cphan@us.ibm.com>2013-11-07 13:01:53 -0600
committerA. Patrick Williams III <iawillia@us.ibm.com>2013-11-12 16:37:10 -0600
commitc328117973c31ab6f0e9ee73c5adc0d5021431da (patch)
tree21a74181934442f125ab2f496d2c688035a1b49d
parent5e07ec95df9bce516fe61bd0d2ba0727fdbd3bb9 (diff)
downloadtalos-hostboot-c328117973c31ab6f0e9ee73c5adc0d5021431da.tar.gz
talos-hostboot-c328117973c31ab6f0e9ee73c5adc0d5021431da.zip
PRD: fix null pointer issue in getMfgThresholdFile
Change-Id: I00dfeb14444bdc718405e5737184890378edc8df CQ: SW233220 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7109 Tested-by: Jenkins Server Reviewed-by: Zane Shelley <zshelle@us.ibm.com> Reviewed-by: BENJAMIN J. WEISENBECK <bweisenb@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com> Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/7200
-rwxr-xr-xsrc/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.C6
-rwxr-xr-xsrc/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.H2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.C b/src/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.C
index 25c0b1049..c2a2b9a9c 100755
--- a/src/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.C
+++ b/src/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.C
@@ -92,6 +92,12 @@ void MfgThresholdMgr::reset()
}
}
+MfgThresholdFile * MfgThresholdMgr::getMfgThresholdFile()
+{
+ setupFile();
+ return iv_file;
+}
+
uint8_t MfgThresholdMgr::getThresholdDefault(uint32_t i_thrName)
{
uint8_t l_value = 0;
diff --git a/src/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.H b/src/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.H
index cec7b02fa..406e08677 100755
--- a/src/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.H
+++ b/src/usr/diag/prdf/common/mnfgtools/prdfMfgThresholdMgr.H
@@ -79,7 +79,7 @@ class MfgThresholdMgr
*
* @return MfgThresholdFile pointer
*/
- inline MfgThresholdFile * getMfgThresholdFile() { return iv_file; };
+ MfgThresholdFile * getMfgThresholdFile();
private:
OpenPOWER on IntegriCloud