diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-19 08:38:16 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-04-19 08:38:16 -0500 |
| commit | f691df528340807d42247fe79a89ea88e6303e1d (patch) | |
| tree | a7d723e846a4754e994026e08d7609c3ea6d3f6f /hw/audio | |
| parent | 5dff24bebae5103810002ea76b1d03927e2148f2 (diff) | |
| parent | ad6b40f471cf8bf7b106032145b1b2ac105f99cf (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By Stefan Weil (3) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
m25p80: Remove bogus include of devices.h
ssh: Remove unnecessary use of strlen function.
block/ssh: Add missing gcc format attributes
linux-user: change do_semop to return target errno when unsuccessful
w64: Fix compiler warnings (wrong format specifier)
Remove unneeded type casts
virtio.h: drop unused function prototypes
bswap: fix compiler warning
Message-id: 1366371241-23430-1-git-send-email-stefanha@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/audio')
| -rw-r--r-- | hw/audio/marvell_88w8618.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/hw/audio/marvell_88w8618.c b/hw/audio/marvell_88w8618.c index f9b68fd311..de06dfd7d2 100644 --- a/hw/audio/marvell_88w8618.c +++ b/hw/audio/marvell_88w8618.c @@ -77,8 +77,7 @@ static void mv88w8618_audio_callback(void *opaque, int free_out, int free_in) if (block_size > 4096) { return; } - cpu_physical_memory_read(s->target_buffer + s->play_pos, (void *)buf, - block_size); + cpu_physical_memory_read(s->target_buffer + s->play_pos, buf, block_size); mem_buffer = buf; if (s->playback_mode & MP_AUDIO_16BIT_SAMPLE) { if (s->playback_mode & MP_AUDIO_MONO) { |