patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / sound / pci / trident / trident_synth.c

diff --git a/sound/pci/trident/trident_synth.c b/sound/pci/trident/trident_synth.c
index a2098ea..8f9797d 100644 (file)
--- a/sound/pci/trident/trident_synth.c
+++ b/sound/pci/trident/trident_synth.c
@@ -504,7 +504,7 @@ static void sample_private1(trident_t * trident, snd_trident_voice_t * voice, un
  */
 
 static int snd_trident_simple_put_sample(void *private_data, simple_instrument_t * instr,
-                                        char *data, long len, int atomic)
+                                        char __user *data, long len, int atomic)
 {
        trident_t *trident = snd_magic_cast(trident_t, private_data, return -ENXIO);
        int size = instr->size;
@@ -557,7 +557,7 @@ static int snd_trident_simple_put_sample(void *private_data, simple_instrument_t
 }
 
 static int snd_trident_simple_get_sample(void *private_data, simple_instrument_t * instr,
-                                        char *data, long len, int atomic)
+                                        char __user *data, long len, int atomic)
 {
        //trident_t *trident = snd_magic_cast(trident_t, private_data, return -ENXIO);
        int size = instr->size;