Fix bug with hal init uninitialized var.
Change-Id: I172bb65b57653e32697f2c2df941beb0aaf65603
diff --git a/libs/rs/driver/rsdCore.cpp b/libs/rs/driver/rsdCore.cpp
index bb6cce9..6546110 100644
--- a/libs/rs/driver/rsdCore.cpp
+++ b/libs/rs/driver/rsdCore.cpp
@@ -111,7 +111,8 @@
rsc->mHal.funcs = FunctionTable;
RsHal *dc = (RsHal *)calloc(1, sizeof(RsHal));
- if (!rsc->mHal.drv) {
+ if (!dc) {
+ LOGE("Calloc for driver hal failed.");
return false;
}
rsc->mHal.drv = dc;
diff --git a/libs/rs/rsContext.cpp b/libs/rs/rsContext.cpp
index 339a773..c761c75 100644
--- a/libs/rs/rsContext.cpp
+++ b/libs/rs/rsContext.cpp
@@ -636,6 +636,7 @@
timerSet(RS_TIMER_INTERNAL);
if (!rsdHalInit(this, 0, 0)) {
+ LOGE("Hal init failed");
return false;
}
mHal.funcs.setPriority(this, mThreadPriority);
@@ -650,6 +651,7 @@
}
if (mError != RS_ERROR_NONE) {
+ LOGE("Errors during thread init");
return false;
}