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

Commit 1b3957ee authored by Vignesh Kulothungan's avatar Vignesh Kulothungan Committed by Gerrit - the friendly Code Review server
Browse files

hal: fix return value checks while getting HDMI info 

Fix error check conditions in functions related to
retrieval of HDMI sink capabilities.

CRs-Fixed: 2574040
Change-Id: Ia4cdf2fbb35601858de456a0da70d967d63375bb
parent 60e3fe5c

hal/audio_hw.c

+4 −3
Original line number Diff line number Diff line
@@ -1957,9 +1957,10 @@ static int read_hdmi_sink_caps(struct stream_out *out) 
    reset_hdmi_sink_caps(out);



    /* Cache ext disp type */

    if (platform_get_ext_disp_type_v2(adev->platform,

    ret = platform_get_ext_disp_type_v2(adev->platform,

                                      out->extconn.cs.controller,

                                      out->extconn.cs.stream <= 0)) {

                                      out->extconn.cs.stream);

    if(ret < 0) {

        ALOGE("%s: Failed to query disp type, ret:%d", __func__, ret);

        return -EINVAL;

    }
@@ -4863,7 +4864,7 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) 


    err = platform_get_controller_stream_from_params(parms, &ext_controller,

                                                       &ext_stream);

    if (err >= 0) {

    if (err == 0) {

        out->extconn.cs.controller = ext_controller;

        out->extconn.cs.stream = ext_stream;

        ALOGD("%s: usecase(%s) new controller/stream (%d/%d)", __func__,

hal/msm8974/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -6002,7 +6002,7 @@ int platform_get_ext_disp_type_v2(void *platform, int controller, int stream) 
        }



        disp_type = mixer_ctl_get_value(ctl, 0);

        if (disp_type == EXT_DISPLAY_TYPE_NONE) {

        if (disp_type <= EXT_DISPLAY_TYPE_NONE) {

             ALOGE("%s: Invalid external display type: %d", __func__, disp_type);

             return -EINVAL;

        }