[zaptel-commits] kpfleming: branch 1.4 r3671 - /branches/1.4/wcte12xp/base.c

[SVN commits to the Zaptel project]

Author: kpfleming
Date: Fri Jan 11 16:39:16 2008
New Revision: 3671

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3671
Log:
minor cleanups

Modified:
    branches/1.4/wcte12xp/base.c

Modified: branches/1.4/wcte12xp/base.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wcte12xp/base.c?view=diff&rev=3671&r1=3670&r2=3671
==============================================================================
--- branches/1.4/wcte12xp/base.c (original)
+++ branches/1.4/wcte12xp/base.c Fri Jan 11 16:39:16 2008
@@ -1308,13 +1308,14 @@
 	if ((ret = adt_lec_parse_params(&params, ecp, p)))
 		return ret;
 
-	work = kmalloc(sizeof(*work), GFP_ATOMIC); 
-	if(!work)
-		return -ENODEV;
-	work->params = params;
 	/* we can't really control the tap length, but the value is used
 	   to control whether the ec is on or off, so translate it */
-	work->params.tap_length = ecp->tap_length ? 1 : 0;
+	params.tap_length = ecp->tap_length ? 1 : 0;
+
+	if (!(work = kmalloc(sizeof(*work), GFP_KERNEL)))
+		return -ENOMEM;
+
+	work->params = params;
 	work->wc = wc;
 	work->chan = chan; 
 	spin_lock_irqsave(&vpm150m->lock, flags);
@@ -1324,6 +1325,7 @@
 	/* we must do this later since we cannot sleep in the echocan function */
 	if (test_bit(VPM150M_ACTIVE, &vpm150m->control))
 		queue_work(vpm150m->wq, &vpm150m->work_echocan);
+
 	return 0; /* how do I return the status since it is done later by the workqueue? */
 }
 #endif