aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2007-12-13 01:53:57 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 15:07:08 -0800
commitf5a3ea6f966700ae82504202fdd827f2d3c79e66 (patch)
treea7bb9853b28458f6c0dcae6d69128da6b1103012
parent860621347e88b23517fc4ec93fa5af940401c3ec (diff)
libertas: use spin_is_locked() instead of spin_trylock() in lbs_interrupt()
We get scary warnings on UP if we use spin_trylock() and find, as we hoped, that the lock in question is already locked. Signed-off-by: David Woodhouse <dwmw2@infradead.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/libertas/main.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 9232b975a42..5d2bf539d4b 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -1414,8 +1414,7 @@ void lbs_interrupt(struct lbs_private *priv)
lbs_deb_thread("lbs_interrupt: intcounter=%d\n", priv->intcounter);
- if (spin_trylock(&priv->driver_lock)) {
- spin_unlock(&priv->driver_lock);
+ if (!spin_is_locked(&priv->driver_lock)) {
printk(KERN_CRIT "%s called without driver_lock held\n", __func__);
WARN_ON(1);
}