diff options
Diffstat (limited to 'sound/core/seq/seq_clientmgr.c')
-rw-r--r-- | sound/core/seq/seq_clientmgr.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 99a485f13648..f2436d33fbf7 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c | |||
@@ -1052,7 +1052,7 @@ static ssize_t snd_seq_write(struct file *file, const char __user *buf, | |||
1052 | } else { | 1052 | } else { |
1053 | #ifdef CONFIG_COMPAT | 1053 | #ifdef CONFIG_COMPAT |
1054 | if (client->convert32 && snd_seq_ev_is_varusr(&event)) { | 1054 | if (client->convert32 && snd_seq_ev_is_varusr(&event)) { |
1055 | void *ptr = compat_ptr(event.data.raw32.d[1]); | 1055 | void *ptr = (void __force *)compat_ptr(event.data.raw32.d[1]); |
1056 | event.data.ext.ptr = ptr; | 1056 | event.data.ext.ptr = ptr; |
1057 | } | 1057 | } |
1058 | #endif | 1058 | #endif |
@@ -2407,7 +2407,7 @@ int snd_seq_kernel_client_ctl(int clientid, unsigned int cmd, void *arg) | |||
2407 | if (client == NULL) | 2407 | if (client == NULL) |
2408 | return -ENXIO; | 2408 | return -ENXIO; |
2409 | fs = snd_enter_user(); | 2409 | fs = snd_enter_user(); |
2410 | result = snd_seq_do_ioctl(client, cmd, (void __user *)arg); | 2410 | result = snd_seq_do_ioctl(client, cmd, (void __force __user *)arg); |
2411 | snd_leave_user(fs); | 2411 | snd_leave_user(fs); |
2412 | return result; | 2412 | return result; |
2413 | } | 2413 | } |
@@ -2497,9 +2497,6 @@ static void snd_seq_info_dump_ports(struct snd_info_buffer *buffer, | |||
2497 | } | 2497 | } |
2498 | 2498 | ||
2499 | 2499 | ||
2500 | void snd_seq_info_pool(struct snd_info_buffer *buffer, | ||
2501 | struct snd_seq_pool *pool, char *space); | ||
2502 | |||
2503 | /* exported to seq_info.c */ | 2500 | /* exported to seq_info.c */ |
2504 | void snd_seq_info_clients_read(struct snd_info_entry *entry, | 2501 | void snd_seq_info_clients_read(struct snd_info_entry *entry, |
2505 | struct snd_info_buffer *buffer) | 2502 | struct snd_info_buffer *buffer) |