Commit 61e5b75c authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-4' into staging 



hda-audio: fix non-mixer codecs

# gpg: Signature made Tue 29 Apr 2014 10:03:44 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-audio-4:
  hda-audio: fix non-mixer codecs

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents b006f816 4843877e

hw/audio/hda-codec.c

+3 −0
Original line number Diff line number Diff line
@@ -261,6 +261,9 @@ static void hda_audio_set_amp(HDAAudioStream *st) 
    left = left * 255 / QEMU_HDA_AMP_STEPS;

    right = right * 255 / QEMU_HDA_AMP_STEPS;



    if (!st->state->mixer) {

        return;

    }

    if (st->output) {

        AUD_set_volume_out(st->voice.out, muted, left, right);

    } else {