Commit:     f5a3ea6f966700ae82504202fdd827f2d3c79e66
Parent:     860621347e88b23517fc4ec93fa5af940401c3ec
Author:     David Woodhouse <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 13 01:53:57 2007 -0500
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:07:08 2008 -0800

    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 <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
 drivers/net/wireless/libertas/main.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/libertas/main.c 
index 9232b97..5d2bf53 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", 
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to