summaryrefslogtreecommitdiffstats
path: root/net/irda/iriap.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-06-14 08:15:49 +0200
committerPaul Mundt <lethal@linux-sh.org>2011-06-14 08:15:49 +0200
commit9aa7719e0c6a1580451900e672744752804f8f75 (patch)
treeba36c5536342db2759d0a1843dffd0c193e26ff0 /net/irda/iriap.c
parentdrivers: sh: resume enabled clocks fix (diff)
parentLinux 3.0-rc3 (diff)
downloadlinux-9aa7719e0c6a1580451900e672744752804f8f75.tar.xz
linux-9aa7719e0c6a1580451900e672744752804f8f75.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh-fixes-for-linus
Diffstat (limited to 'net/irda/iriap.c')
-rw-r--r--net/irda/iriap.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index 36477538cea8..f876eed7d4aa 100644
--- a/net/irda/iriap.c
+++ b/net/irda/iriap.c
@@ -87,6 +87,8 @@ static inline void iriap_start_watchdog_timer(struct iriap_cb *self,
iriap_watchdog_timer_expired);
}
+static struct lock_class_key irias_objects_key;
+
/*
* Function iriap_init (void)
*
@@ -114,6 +116,9 @@ int __init iriap_init(void)
return -ENOMEM;
}
+ lockdep_set_class_and_name(&irias_objects->hb_spinlock, &irias_objects_key,
+ "irias_objects");
+
/*
* Register some default services for IrLMP
*/