vserver 1.9.5.x5

[linux-2.6.git] / sound / pci / mixart / mixart_core.c

diff --git a/sound/pci/mixart/mixart_core.c b/sound/pci/mixart/mixart_core.c
index 1f588ee..ba0027f 100644 (file)
--- a/sound/pci/mixart/mixart_core.c
+++ b/sound/pci/mixart/mixart_core.c
@@ -72,9 +72,12 @@ static int retrieve_msg_frame(mixart_mgr_t *mgr, u32 *msg_frame)
 static int get_msg(mixart_mgr_t *mgr, mixart_msg_t *resp, u32 msg_frame_address )
 {
        unsigned long flags;
-       u32  headptr, i;
+       u32  headptr;
        u32  size;
        int  err;
+#ifndef __BIG_ENDIAN
+       unsigned int i;
+#endif
 
        spin_lock_irqsave(&mgr->msg_lock, flags);
        err = 0;
@@ -92,7 +95,7 @@ static int get_msg(mixart_mgr_t *mgr, mixart_msg_t *resp, u32 msg_frame_address
        }
        size -= MSG_DESCRIPTOR_SIZE;
 
-       memcpy_fromio(resp->data, (void *)MIXART_MEM(mgr, msg_frame_address + MSG_HEADER_SIZE ), size);
+       memcpy_fromio(resp->data, MIXART_MEM(mgr, msg_frame_address + MSG_HEADER_SIZE ), size);
        resp->size = size;
 
        /* swap if necessary */