diff options
Diffstat (limited to 'sound/oss/dmasound/dmasound_q40.c')
-rw-r--r-- | sound/oss/dmasound/dmasound_q40.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/oss/dmasound/dmasound_q40.c b/sound/oss/dmasound/dmasound_q40.c index 1ddaa6284b08..e2081f32b0c4 100644 --- a/sound/oss/dmasound/dmasound_q40.c +++ b/sound/oss/dmasound/dmasound_q40.c | |||
@@ -58,7 +58,7 @@ static void Q40Interrupt(void); | |||
58 | 58 | ||
59 | 59 | ||
60 | /* userCount, frameUsed, frameLeft == byte counts */ | 60 | /* userCount, frameUsed, frameLeft == byte counts */ |
61 | static ssize_t q40_ct_law(const u_char *userPtr, size_t userCount, | 61 | static ssize_t q40_ct_law(const u_char __user *userPtr, size_t userCount, |
62 | u_char frame[], ssize_t *frameUsed, | 62 | u_char frame[], ssize_t *frameUsed, |
63 | ssize_t frameLeft) | 63 | ssize_t frameLeft) |
64 | { | 64 | { |
@@ -79,7 +79,7 @@ static ssize_t q40_ct_law(const u_char *userPtr, size_t userCount, | |||
79 | } | 79 | } |
80 | 80 | ||
81 | 81 | ||
82 | static ssize_t q40_ct_s8(const u_char *userPtr, size_t userCount, | 82 | static ssize_t q40_ct_s8(const u_char __user *userPtr, size_t userCount, |
83 | u_char frame[], ssize_t *frameUsed, | 83 | u_char frame[], ssize_t *frameUsed, |
84 | ssize_t frameLeft) | 84 | ssize_t frameLeft) |
85 | { | 85 | { |
@@ -98,7 +98,7 @@ static ssize_t q40_ct_s8(const u_char *userPtr, size_t userCount, | |||
98 | return used; | 98 | return used; |
99 | } | 99 | } |
100 | 100 | ||
101 | static ssize_t q40_ct_u8(const u_char *userPtr, size_t userCount, | 101 | static ssize_t q40_ct_u8(const u_char __user *userPtr, size_t userCount, |
102 | u_char frame[], ssize_t *frameUsed, | 102 | u_char frame[], ssize_t *frameUsed, |
103 | ssize_t frameLeft) | 103 | ssize_t frameLeft) |
104 | { | 104 | { |
@@ -114,7 +114,7 @@ static ssize_t q40_ct_u8(const u_char *userPtr, size_t userCount, | |||
114 | 114 | ||
115 | 115 | ||
116 | /* a bit too complicated to optimise right now ..*/ | 116 | /* a bit too complicated to optimise right now ..*/ |
117 | static ssize_t q40_ctx_law(const u_char *userPtr, size_t userCount, | 117 | static ssize_t q40_ctx_law(const u_char __user *userPtr, size_t userCount, |
118 | u_char frame[], ssize_t *frameUsed, | 118 | u_char frame[], ssize_t *frameUsed, |
119 | ssize_t frameLeft) | 119 | ssize_t frameLeft) |
120 | { | 120 | { |
@@ -152,7 +152,7 @@ static ssize_t q40_ctx_law(const u_char *userPtr, size_t userCount, | |||
152 | } | 152 | } |
153 | 153 | ||
154 | 154 | ||
155 | static ssize_t q40_ctx_s8(const u_char *userPtr, size_t userCount, | 155 | static ssize_t q40_ctx_s8(const u_char __user *userPtr, size_t userCount, |
156 | u_char frame[], ssize_t *frameUsed, | 156 | u_char frame[], ssize_t *frameUsed, |
157 | ssize_t frameLeft) | 157 | ssize_t frameLeft) |
158 | { | 158 | { |
@@ -189,7 +189,7 @@ static ssize_t q40_ctx_s8(const u_char *userPtr, size_t userCount, | |||
189 | } | 189 | } |
190 | 190 | ||
191 | 191 | ||
192 | static ssize_t q40_ctx_u8(const u_char *userPtr, size_t userCount, | 192 | static ssize_t q40_ctx_u8(const u_char __user *userPtr, size_t userCount, |
193 | u_char frame[], ssize_t *frameUsed, | 193 | u_char frame[], ssize_t *frameUsed, |
194 | ssize_t frameLeft) | 194 | ssize_t frameLeft) |
195 | { | 195 | { |
@@ -224,7 +224,7 @@ static ssize_t q40_ctx_u8(const u_char *userPtr, size_t userCount, | |||
224 | } | 224 | } |
225 | 225 | ||
226 | /* compressing versions */ | 226 | /* compressing versions */ |
227 | static ssize_t q40_ctc_law(const u_char *userPtr, size_t userCount, | 227 | static ssize_t q40_ctc_law(const u_char __user *userPtr, size_t userCount, |
228 | u_char frame[], ssize_t *frameUsed, | 228 | u_char frame[], ssize_t *frameUsed, |
229 | ssize_t frameLeft) | 229 | ssize_t frameLeft) |
230 | { | 230 | { |
@@ -265,7 +265,7 @@ static ssize_t q40_ctc_law(const u_char *userPtr, size_t userCount, | |||
265 | } | 265 | } |
266 | 266 | ||
267 | 267 | ||
268 | static ssize_t q40_ctc_s8(const u_char *userPtr, size_t userCount, | 268 | static ssize_t q40_ctc_s8(const u_char __user *userPtr, size_t userCount, |
269 | u_char frame[], ssize_t *frameUsed, | 269 | u_char frame[], ssize_t *frameUsed, |
270 | ssize_t frameLeft) | 270 | ssize_t frameLeft) |
271 | { | 271 | { |
@@ -304,7 +304,7 @@ static ssize_t q40_ctc_s8(const u_char *userPtr, size_t userCount, | |||
304 | } | 304 | } |
305 | 305 | ||
306 | 306 | ||
307 | static ssize_t q40_ctc_u8(const u_char *userPtr, size_t userCount, | 307 | static ssize_t q40_ctc_u8(const u_char __user *userPtr, size_t userCount, |
308 | u_char frame[], ssize_t *frameUsed, | 308 | u_char frame[], ssize_t *frameUsed, |
309 | ssize_t frameLeft) | 309 | ssize_t frameLeft) |
310 | { | 310 | { |