From f5a3ea6f966700ae82504202fdd827f2d3c79e66 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 13 Dec 2007 01:53:57 -0500 Subject: 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 Signed-off-by: John W. Linville --- drivers/net/wireless/libertas/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'drivers/net/wireless/libertas/main.c') 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); } -- cgit v1.2.3