diff options
| author | Ingo Molnar <mingo@elte.hu> | 2006-07-03 00:25:21 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-03 15:27:08 -0700 |
| commit | d8371f0481fd1ad2701081d37815b0bb5d236b92 (patch) | |
| tree | ad127a93c6216dde9b89549c01a2fd0df5c8290d /sound/core/seq | |
| parent | 8e7795ef6b5fd117b22b87ea7d501de2526a25f7 (diff) | |
| download | op-kernel-dev-d8371f0481fd1ad2701081d37815b0bb5d236b92.zip op-kernel-dev-d8371f0481fd1ad2701081d37815b0bb5d236b92.tar.gz | |
[PATCH] lockdep: annotate sound/core/seq/seq_ports.c
Teach special (recursive) locking code to the lock validator. Has no effect
on non-lockdep kernels.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Takashi Iwai <tiwai@suse.de>
Cc: Jaroslav Kysela <perex@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'sound/core/seq')
| -rw-r--r-- | sound/core/seq/seq_ports.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/seq/seq_ports.c b/sound/core/seq/seq_ports.c index d467b4f..8c64b58 100644 --- a/sound/core/seq/seq_ports.c +++ b/sound/core/seq/seq_ports.c @@ -514,7 +514,7 @@ int snd_seq_port_connect(struct snd_seq_client *connector, atomic_set(&subs->ref_count, 2); down_write(&src->list_mutex); - down_write(&dest->list_mutex); + down_write_nested(&dest->list_mutex, SINGLE_DEPTH_NESTING); exclusive = info->flags & SNDRV_SEQ_PORT_SUBS_EXCLUSIVE ? 1 : 0; err = -EBUSY; @@ -587,7 +587,7 @@ int snd_seq_port_disconnect(struct snd_seq_client *connector, unsigned long flags; down_write(&src->list_mutex); - down_write(&dest->list_mutex); + down_write_nested(&dest->list_mutex, SINGLE_DEPTH_NESTING); /* look for the connection */ list_for_each(p, &src->list_head) { |
