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

Commit 5efd15e5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: set USB RX mixer controls' name before initializing their values"

parents 36f12bac b9c3d0ac

hal/msm8974/platform.c

+20 −20
Original line number Diff line number Diff line
@@ -2561,6 +2561,26 @@ acdb_init_fail: 
    my_data->current_backend_cfg[HDMI_TX_BACKEND].channels_mixer_ctl =

        strdup("QUAT_MI2S_TX Channels");



    my_data->current_backend_cfg[HDMI_RX_BACKEND].bitwidth_mixer_ctl =

        strdup("HDMI_RX Bit Format");

    my_data->current_backend_cfg[HDMI_RX_BACKEND].samplerate_mixer_ctl =

        strdup("HDMI_RX SampleRate");

    my_data->current_backend_cfg[HDMI_RX_BACKEND].channels_mixer_ctl =

        strdup("HDMI_RX Channels");

    my_data->current_backend_cfg[DISP_PORT_RX_BACKEND].bitwidth_mixer_ctl =

        strdup("Display Port RX Bit Format");

    my_data->current_backend_cfg[DISP_PORT_RX_BACKEND].samplerate_mixer_ctl =

        strdup("Display Port RX SampleRate");

    my_data->current_backend_cfg[DISP_PORT_RX_BACKEND].channels_mixer_ctl =

        strdup("Display Port RX Channels");



    my_data->current_backend_cfg[USB_AUDIO_RX_BACKEND].bitwidth_mixer_ctl =

        strdup("USB_AUDIO_RX Format");

    my_data->current_backend_cfg[USB_AUDIO_RX_BACKEND].samplerate_mixer_ctl =

        strdup("USB_AUDIO_RX SampleRate");

    my_data->current_backend_cfg[USB_AUDIO_RX_BACKEND].channels_mixer_ctl =

        strdup("USB_AUDIO_RX Channels");



    for (idx = 0; idx < MAX_CODEC_BACKENDS; idx++) {

        if (my_data->current_backend_cfg[idx].bitwidth_mixer_ctl) {

            ctl = mixer_get_ctl_by_name(adev->mixer,
@@ -2620,26 +2640,6 @@ acdb_init_fail: 
        }

    }



    my_data->current_backend_cfg[HDMI_RX_BACKEND].bitwidth_mixer_ctl =

        strdup("HDMI_RX Bit Format");

    my_data->current_backend_cfg[HDMI_RX_BACKEND].samplerate_mixer_ctl =

        strdup("HDMI_RX SampleRate");

    my_data->current_backend_cfg[HDMI_RX_BACKEND].channels_mixer_ctl =

        strdup("HDMI_RX Channels");

    my_data->current_backend_cfg[DISP_PORT_RX_BACKEND].bitwidth_mixer_ctl =

        strdup("Display Port RX Bit Format");

    my_data->current_backend_cfg[DISP_PORT_RX_BACKEND].samplerate_mixer_ctl =

        strdup("Display Port RX SampleRate");

    my_data->current_backend_cfg[DISP_PORT_RX_BACKEND].channels_mixer_ctl =

        strdup("Display Port RX Channels");



    my_data->current_backend_cfg[USB_AUDIO_RX_BACKEND].bitwidth_mixer_ctl =

        strdup("USB_AUDIO_RX Format");

    my_data->current_backend_cfg[USB_AUDIO_RX_BACKEND].samplerate_mixer_ctl =

        strdup("USB_AUDIO_RX SampleRate");

    my_data->current_backend_cfg[USB_AUDIO_RX_BACKEND].channels_mixer_ctl =

        strdup("USB_AUDIO_RX Channels");



    if (property_get_bool("vendor.audio.apptype.multirec.enabled", false))

        my_data->use_generic_handset = true;