From dba40e60882da82a928d6969cd7d39cb9cb0c929 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Thu, 13 Dec 2007 01:53:57 -0500 Subject: [PATCH] --- yaml --- r: 79197 b: refs/heads/master c: f5a3ea6f966700ae82504202fdd827f2d3c79e66 h: refs/heads/master i: 79195: 51802d2292b0e5a2e71cfd2e7206a4b313fc5ed5 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/libertas/main.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index e1dea142af3d..9a445c69d827 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 860621347e88b23517fc4ec93fa5af940401c3ec +refs/heads/master: f5a3ea6f966700ae82504202fdd827f2d3c79e66 diff --git a/trunk/drivers/net/wireless/libertas/main.c b/trunk/drivers/net/wireless/libertas/main.c index 9232b975a42c..5d2bf539d4b9 100644 --- a/trunk/drivers/net/wireless/libertas/main.c +++ b/trunk/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); }