Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / sound / oss / awe_wave.c

diff --git a/sound/oss/awe_wave.c b/sound/oss/awe_wave.c
index e53bd26..f49a2de 100644 (file)
--- a/sound/oss/awe_wave.c
+++ b/sound/oss/awe_wave.c
@@ -3344,10 +3344,10 @@ readbuf_word(int pos)
        /* read from user buffer */
        if (readbuf_flags & AWE_SAMPLE_8BITS) {
                unsigned char cc;
-               get_user(cc, (unsigned __user char*)(readbuf_addr + readbuf_offs + pos));
+               get_user(cc, (unsigned char __user *)(readbuf_addr + readbuf_offs + pos));
                c = (unsigned short)cc << 8; /* convert 8bit -> 16bit */
        } else {
-               get_user(c, (unsigned __user short*)(readbuf_addr + readbuf_offs + pos * 2));
+               get_user(c, (unsigned short __user *)(readbuf_addr + readbuf_offs + pos * 2));
        }
        if (readbuf_flags & AWE_SAMPLE_UNSIGNED)
                c ^= 0x8000; /* unsigned -> signed */