summaryrefslogtreecommitdiffstats
path: root/src/usr/util
diff options
context:
space:
mode:
authorPatrick Williams <iawillia@us.ibm.com>2013-05-08 13:43:26 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2013-05-15 09:34:02 -0500
commitb0fc4d4e4bd6d78040b96674a2fe65fc306ea995 (patch)
treeaff044f9569a674b403496be54ad939af2ac76fb /src/usr/util
parentc24b25d1a269c4f814b634e49d81a8bb3772f0e7 (diff)
downloadtalos-hostboot-b0fc4d4e4bd6d78040b96674a2fe65fc306ea995.tar.gz
talos-hostboot-b0fc4d4e4bd6d78040b96674a2fe65fc306ea995.zip
BEAM fixes for various components.
Change-Id: I900f33eefeeeaa35d981b93c1af0bec8ab4000c2 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/4424 Tested-by: Jenkins Server Reviewed-by: ADAM R. MUHLE <armuhle@us.ibm.com> Reviewed-by: Mark W. Wenning <wenning@us.ibm.com> Reviewed-by: Brian H. Horton <brianh@linux.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/util')
-rw-r--r--src/usr/util/utillidmgr.C5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/usr/util/utillidmgr.C b/src/usr/util/utillidmgr.C
index ebff8d77c..73cac29b0 100644
--- a/src/usr/util/utillidmgr.C
+++ b/src/usr/util/utillidmgr.C
@@ -83,7 +83,7 @@ errlHndl_t UtilLidMgr::getLidSize(size_t& o_lidSize)
iv_lidSize = o_lidSize;
break;
}
-
+
//if we get here, it means we didn't find the LID in PNOR, so
//ask the FSP for it.
@@ -394,7 +394,8 @@ errlHndl_t UtilLidMgr::getLid(void* i_dest, size_t i_destSize)
Util::UTIL_LIDMGR_INVAL_DATA,
TWO_UINT32_TO_UINT64(curLid,
iv_lidId),
- TWO_UINT32_TO_UINT64(*(dataPtr),
+ TWO_UINT32_TO_UINT64(
+ NULL != dataPtr ? *(dataPtr) : 0,
0)
);
OpenPOWER on IntegriCloud