git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
sound
/
core
/
seq
/
seq_info.c
diff --git
a/sound/core/seq/seq_info.c
b/sound/core/seq/seq_info.c
index
acce21a
..
8a7fe5c
100644
(file)
--- a/
sound/core/seq/seq_info.c
+++ b/
sound/core/seq/seq_info.c
@@
-34,8
+34,8
@@
static struct snd_info_entry *timer_entry;
static struct snd_info_entry * __init
static struct snd_info_entry * __init
-create_info_entry(char *name,
int size,
void (*read)(struct snd_info_entry *,
-
struct snd_info_buffer *))
+create_info_entry(char *name, void (*read)(struct snd_info_entry *,
+ struct snd_info_buffer *))
{
struct snd_info_entry *entry;
{
struct snd_info_entry *entry;
@@
-43,7
+43,6
@@
create_info_entry(char *name, int size, void (*read)(struct snd_info_entry *,
if (entry == NULL)
return NULL;
entry->content = SNDRV_INFO_CONTENT_TEXT;
if (entry == NULL)
return NULL;
entry->content = SNDRV_INFO_CONTENT_TEXT;
- entry->c.text.read_size = size;
entry->c.text.read = read;
if (snd_info_register(entry) < 0) {
snd_info_free_entry(entry);
entry->c.text.read = read;
if (snd_info_register(entry) < 0) {
snd_info_free_entry(entry);
@@
-55,19
+54,19
@@
create_info_entry(char *name, int size, void (*read)(struct snd_info_entry *,
/* create all our /proc entries */
int __init snd_seq_info_init(void)
{
/* create all our /proc entries */
int __init snd_seq_info_init(void)
{
- queues_entry = create_info_entry("queues",
512 + (256 * SNDRV_SEQ_MAX_QUEUES),
+ queues_entry = create_info_entry("queues",
snd_seq_info_queues_read);
snd_seq_info_queues_read);
- clients_entry = create_info_entry("clients",
512 + (256 * SNDRV_SEQ_MAX_CLIENTS),
+ clients_entry = create_info_entry("clients",
snd_seq_info_clients_read);
snd_seq_info_clients_read);
- timer_entry = create_info_entry("timer",
1024,
snd_seq_info_timer_read);
+ timer_entry = create_info_entry("timer", snd_seq_info_timer_read);
return 0;
}
int __exit snd_seq_info_done(void)
{
return 0;
}
int __exit snd_seq_info_done(void)
{
- snd_info_
unregister
(queues_entry);
- snd_info_
unregister
(clients_entry);
- snd_info_
unregister
(timer_entry);
+ snd_info_
free_entry
(queues_entry);
+ snd_info_
free_entry
(clients_entry);
+ snd_info_
free_entry
(timer_entry);
return 0;
}
#endif
return 0;
}
#endif