From: Arjan van de Ven <arjan@linux.intel.com>

The ops structure has complex locking rules, where not all ops are equal,
some are subordinate on others for some complex sound cards.  This requires
for lockdep checking that each individual reg_mutex is considered in
separation for its locking rules.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 sound/core/seq/seq_device.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff -puN sound/core/seq/seq_device.c~lock-validator-special-locking-sound-core-seq-seq_devicec sound/core/seq/seq_device.c
--- devel/sound/core/seq/seq_device.c~lock-validator-special-locking-sound-core-seq-seq_devicec	2006-05-30 14:46:01.000000000 -0700
+++ devel-akpm/sound/core/seq/seq_device.c	2006-05-30 14:46:01.000000000 -0700
@@ -46,6 +46,7 @@
 #include <linux/kmod.h>
 #include <linux/slab.h>
 #include <linux/mutex.h>
+#include <linux/lockdep.h>
 
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>");
 MODULE_DESCRIPTION("ALSA sequencer device management");
@@ -73,6 +74,8 @@ struct ops_list {
 	struct mutex reg_mutex;
 
 	struct list_head list;	/* next driver */
+
+	struct lockdep_type_key reg_mutex_key;
 };
 
 
@@ -379,7 +382,7 @@ static struct ops_list * create_driver(c
 
 	/* set up driver entry */
 	strlcpy(ops->id, id, sizeof(ops->id));
-	mutex_init(&ops->reg_mutex);
+	mutex_init_key(&ops->reg_mutex, id, &ops->reg_mutex_key);
 	ops->driver = DRIVER_EMPTY;
 	INIT_LIST_HEAD(&ops->dev_list);
 	/* lock this instance */
_