Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80e29cf5 authored by Jason Sams's avatar Jason Sams
Browse files

Fix bug with hal init uninitialized var. 

Change-Id: I172bb65b57653e32697f2c2df941beb0aaf65603
parent 233c43c3

libs/rs/driver/rsdCore.cpp

+2 −1
Original line number Diff line number Diff line
@@ -111,7 +111,8 @@ bool rsdHalInit(Context *rsc, uint32_t version_major, uint32_t version_minor) { 
    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;

libs/rs/rsContext.cpp

+2 −0
Original line number Diff line number Diff line
@@ -636,6 +636,7 @@ bool Context::initContext(Device *dev, const RsSurfaceConfig *sc) { 
    timerSet(RS_TIMER_INTERNAL);



    if (!rsdHalInit(this, 0, 0)) {

        LOGE("Hal init failed");

        return false;

    }

    mHal.funcs.setPriority(this, mThreadPriority);
@@ -650,6 +651,7 @@ bool Context::initContext(Device *dev, const RsSurfaceConfig *sc) { 
    }



    if (mError != RS_ERROR_NONE) {

        LOGE("Errors during thread init");

        return false;

    }