From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 13 Dec 2007 06:53:57 +0000 (-0500)
Subject: libertas: use spin_is_locked() instead of spin_trylock() in lbs_interrupt()
X-Git-Tag: v2.6.25-rc1~1162^2~351
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5a3ea6f966700ae82504202fdd827f2d3c79e66;p=linux-2.6

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>
---

diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index 9232b975a4..5d2bf539d4 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);
 	}