Static code analysis scan issue fix

Fix the issues found during code static scan

Tested:
build okay.

Change-Id: I9a4eb51b502cd55a8be66693c5db23e54e78d98c
Signed-off-by: Yong Li <yong.b.li@linux.intel.com>