From fb2ec51289f222d34fd7075fd57c278ccb2ff9e7 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 21 Jun 2010 21:00:28 +0000 Subject: [PATCH] Fixed build. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@37211 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/drivers/audio/null/null_multi.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/add-ons/kernel/drivers/audio/null/null_multi.c b/src/add-ons/kernel/drivers/audio/null/null_multi.c index 25c713e527..02d2f95ff6 100644 --- a/src/add-ons/kernel/drivers/audio/null/null_multi.c +++ b/src/add-ons/kernel/drivers/audio/null/null_multi.c @@ -48,9 +48,10 @@ multi_channel_info channel_descriptions[] = { static status_t get_description(void* cookie, multi_description* data) { - dprintf("null_audio: %s\n" , __func__ ); - multi_description description; + + dprintf("null_audio: %s\n" , __func__ ); + if (user_memcpy(&description, data, sizeof(multi_description)) != B_OK) { return B_BAD_ADDRESS; } @@ -84,7 +85,7 @@ get_description(void* cookie, multi_description* data) if (user_memcpy(data, &description, sizeof(multi_description)) != B_OK) return B_BAD_ADDRESS; - + if (description.request_channel_count >= sizeof(channel_descriptions) / sizeof(channel_descriptions[0])) { if (user_memcpy(data->channels, @@ -156,7 +157,7 @@ create_group_control(multi_mix_control* multi, int32 idx, int32 parent, multi->string = string; if (name) strcpy(multi->name, name); - + return multi->id; } @@ -202,7 +203,7 @@ get_buffers(device_t* device, multi_buffer_list* data) status_t result; dprintf("null_audio: %s\n" , __func__ ); - + // Workaround for Haiku multi_audio API, since it prefers // to let the driver pick values, while the BeOS multi_audio // actually gives the user's defaults.