[svn-commits] sruffell: branch linux/sruffell/dahdi-linux-cmdqueue r6340 - /linux/team/sruf...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Tue Apr  7 13:45:17 2009
New Revision: 6340

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6340
Log:
Stop VPM processing first in shutdown.

Modified:
    linux/team/sruffell/dahdi-linux-cmdqueue/drivers/dahdi/wcte12xp/base.c

Modified: linux/team/sruffell/dahdi-linux-cmdqueue/drivers/dahdi/wcte12xp/base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/sruffell/dahdi-linux-cmdqueue/drivers/dahdi/wcte12xp/base.c?view=diff&rev=6340&r1=6339&r2=6340
==============================================================================
--- linux/team/sruffell/dahdi-linux-cmdqueue/drivers/dahdi/wcte12xp/base.c (original)
+++ linux/team/sruffell/dahdi-linux-cmdqueue/drivers/dahdi/wcte12xp/base.c Tue Apr  7 13:45:17 2009
@@ -1451,10 +1451,6 @@
 	if (!wc)
 		return;
 
-	clear_bit(INITIALIZED, &wc->bit_flags);
-	del_timer_sync(&wc->timer);
-	flush_scheduled_work();
-	del_timer_sync(&wc->timer);
 #ifdef VPM_SUPPORT
 	if(vpm150m) {
 		clear_bit(VPM150M_DTMFDETECT, &vpm150m->control);
@@ -1463,6 +1459,10 @@
 		destroy_workqueue(vpm150m->wq);
 	}
 #endif
+	clear_bit(INITIALIZED, &wc->bit_flags);
+	del_timer_sync(&wc->timer);
+	flush_scheduled_work();
+	del_timer_sync(&wc->timer);
 
 	BUG_ON(!wc->vb);
 	voicebus_release(wc->vb);