diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-01-22 18:57:36 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-01-22 18:57:36 +0000 |
| commit | c6441452b50c44fdbb362b239ce623f77cf3cd51 (patch) | |
| tree | 2515967c26ad34379b2954ce075b7bfd04282275 /hw | |
| parent | 8f970eff6e318524f189f105c236e47633759890 (diff) | |
| parent | 9939375c282a0f97afa69dc6799d3c77aaf7d544 (diff) | |
| download | qemu-c6441452b50c44fdbb362b239ce623f77cf3cd51.zip qemu-c6441452b50c44fdbb362b239ce623f77cf3cd51.tar.gz qemu-c6441452b50c44fdbb362b239ce623f77cf3cd51.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-audio-20150122-1' into staging
b16: fix interrupt acknowledgement
# gpg: Signature made Thu 22 Jan 2015 11:38:29 GMT 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-20150122-1:
sb16: fix interrupt acknowledgement
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/audio/sb16.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c index bda26d0..444eb9e 100644 --- a/hw/audio/sb16.c +++ b/hw/audio/sb16.c @@ -999,7 +999,7 @@ static IO_READ_PROTO (dsp_read) retval = (!s->out_data_len || s->highspeed) ? 0 : 0x80; if (s->mixer_regs[0x82] & 1) { ack = 1; - s->mixer_regs[0x82] &= 1; + s->mixer_regs[0x82] &= ~1; qemu_irq_lower (s->pic); } break; @@ -1008,7 +1008,7 @@ static IO_READ_PROTO (dsp_read) retval = 0xff; if (s->mixer_regs[0x82] & 2) { ack = 1; - s->mixer_regs[0x82] &= 2; + s->mixer_regs[0x82] &= ~2; qemu_irq_lower (s->pic); } break; |