1 files changed, 19 insertions, 6 deletions

diff --git a/sound/pci/asihpi/hpi6205.h b/sound/pci/asihpi/hpi6205.h
index df2f02c0c7b..ec0827b633a 100644
--- a/sound/pci/asihpi/hpi6205.h
+++ b/sound/pci/asihpi/hpi6205.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
 
     AudioScience HPI driver
-    Copyright (C) 1997-2010  AudioScience Inc. <support@audioscience.com>
+    Copyright (C) 1997-2011  AudioScience Inc. <support@audioscience.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of version 2 of the GNU General Public License as
@@ -70,15 +70,28 @@ The Host located memory buffer that the 6205 will bus master
 in and out of.
 ************************************************************/
 #define HPI6205_SIZEOF_DATA (16*1024)
+
+struct message_buffer_6205 {
+        struct hpi_message message;
+        char data[256];
+};
+
+struct response_buffer_6205 {
+        struct hpi_response response;
+        char data[256];
+};
+
+union buffer_6205 {
+        struct message_buffer_6205 message_buffer;
+        struct response_buffer_6205 response_buffer;
+        u8 b_data[HPI6205_SIZEOF_DATA];
+};
+
 struct bus_master_interface {
         u32 host_cmd;
         u32 dsp_ack;
         u32 transfer_size_in_bytes;
-        union {
-                struct hpi_message_header message_buffer;
-                struct hpi_response_header response_buffer;
-                u8 b_data[HPI6205_SIZEOF_DATA];
-        } u;
+        union buffer_6205 u;
         struct controlcache_6205 control_cache;
         struct async_event_buffer_6205 async_buffer;
         struct hpi_hostbuffer_status