[zaptel-commits] automerge: branch mspiceland/trunk-tdm800 r1746 - /team/mspiceland/trunk-tdm800/

[zaptel-commits at lists.digium.com]

Author: automerge
Date: Tue Dec 19 18:06:42 2006
New Revision: 1746

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1746
Log:
automerge commit

Modified:
    team/mspiceland/trunk-tdm800/   (props changed)
    team/mspiceland/trunk-tdm800/zttranscode.c

Propchange: team/mspiceland/trunk-tdm800/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 19 18:06:42 2006
@@ -1,1 +1,1 @@
-/trunk:1-1737
+/trunk:1-1745

Modified: team/mspiceland/trunk-tdm800/zttranscode.c
URL: http://svn.digium.com/view/zaptel/team/mspiceland/trunk-tdm800/zttranscode.c?view=diff&rev=1746&r1=1745&r2=1746
==============================================================================
--- team/mspiceland/trunk-tdm800/zttranscode.c (original)
+++ team/mspiceland/trunk-tdm800/zttranscode.c Tue Dec 19 18:06:42 2006
@@ -207,14 +207,16 @@
 	if (!ztc)
 		return;
 
-	for (page = virt_to_page(zth);
-	     page < virt_to_page((unsigned long) zth + sizeof(*zth));
-	     page++)
-		ClearPageReserved(page);
-
 	ztc->flags &= ~(ZT_TC_FLAG_BUSY);
-	if (ztc->tch)
+
+	if (ztc->tch) {
+		for (page = virt_to_page(zth);
+		     page < virt_to_page((unsigned long) zth + sizeof(*zth));
+		     page++)
+			ClearPageReserved(page);
 		kfree(ztc->tch);
+	}
+
 	ztc->tch = NULL;
 	/* Actually reset the transcoder channel */
 	if (ztc->flags & ZT_TC_FLAG_TRANSIENT)