[zaptel-commits] sruffell: branch 1.4 r3561 - in /branches: 1.2/wcte12xp/ 1.4/wcte12xp/

[SVN commits to the Zaptel project]

Author: sruffell
Date: Thu Dec 27 12:02:05 2007
New Revision: 3561

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3561
Log:
Shouldn't destroy the workqueue with the lock held.

Modified:
    branches/1.2/wcte12xp/vpmadt032.c
    branches/1.4/wcte12xp/vpmadt032.c

Modified: branches/1.2/wcte12xp/vpmadt032.c
URL: http://svn.digium.com/view/zaptel/branches/1.2/wcte12xp/vpmadt032.c?view=diff&rev=3561&r1=3560&r2=3561
==============================================================================
--- branches/1.2/wcte12xp/vpmadt032.c (original)
+++ branches/1.2/wcte12xp/vpmadt032.c Thu Dec 27 12:02:05 2007
@@ -953,10 +953,10 @@
 	return;
 
 failed_exit:
-	spin_lock_irqsave(&wc->reglock, flags);
 	if (vpm150m->wq) {
 		destroy_workqueue(vpm150m->wq);
 	}
+	spin_lock_irqsave(&wc->reglock, flags);
 	wc->vpm150m = NULL;
 	spin_unlock_irqrestore(&wc->reglock, flags);
 	kfree(vpm150m);

Modified: branches/1.4/wcte12xp/vpmadt032.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp/vpmadt032.c?view=diff&rev=3561&r1=3560&r2=3561
==============================================================================
--- branches/1.4/wcte12xp/vpmadt032.c (original)
+++ branches/1.4/wcte12xp/vpmadt032.c Thu Dec 27 12:02:05 2007
@@ -953,10 +953,10 @@
 	return;
 
 failed_exit:
-	spin_lock_irqsave(&wc->reglock, flags);
 	if (vpm150m->wq) {
 		destroy_workqueue(vpm150m->wq);
 	}
+	spin_lock_irqsave(&wc->reglock, flags);
 	wc->vpm150m = NULL;
 	spin_unlock_irqrestore(&wc->reglock, flags);
 	kfree(vpm150m);