[dahdi-commits] sruffell: branch linux/sruffell/dahdi-linux-chainedvb r7303 - /linux/team/sru...

[SVN commits to the DAHDI project]

Author: sruffell
Date: Thu Oct  1 15:42:53 2009
New Revision: 7303

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7303
Log:
wip: Fixing up some of the cleanup code.

Modified:
    linux/team/sruffell/dahdi-linux-chainedvb/drivers/dahdi/voicebus/voicebus.c

Modified: linux/team/sruffell/dahdi-linux-chainedvb/drivers/dahdi/voicebus/voicebus.c
URL: http://svnview.digium.com/svn/dahdi/linux/team/sruffell/dahdi-linux-chainedvb/drivers/dahdi/voicebus/voicebus.c?view=diff&rev=7303&r1=7302&r2=7303
==============================================================================
--- linux/team/sruffell/dahdi-linux-chainedvb/drivers/dahdi/voicebus/voicebus.c (original)
+++ linux/team/sruffell/dahdi-linux-chainedvb/drivers/dahdi/voicebus/voicebus.c Thu Oct  1 15:42:53 2009
@@ -386,12 +386,13 @@
 	struct list_head *const list = &dl->list;
 
 	list_for_each_entry(d, list, node) {
-		if (d->desc->buffer1) {
+		if (d->desc->buffer1 && (d->desc->buffer1 != vb->idle_vbb_dma_addr)) {
+			dev_dbg(&vb->pdev->dev, "buffer1: %p\n", (void*)vb->idle_vbb_dma_addr);
 			BUG_ON(!d->pending);
 			voicebus_free(vb, d->pending);
-			d->pending = vb->idle_vbb;
-			d->desc->buffer1 = vb->idle_vbb_dma_addr;
 		}
+		d->desc->buffer1 = vb->idle_vbb_dma_addr;
+		d->pending = vb->idle_vbb;
 		SET_OWNED(d->desc);
 	}
 	dl->head = list_entry(list->next, typeof(*d), node);
@@ -561,8 +562,8 @@
 	}
 
 	list_for_each_entry(d, &vb->txd.list, node) {
-		dev_dbg(&vb->pdev->dev, "desc: %08x (next: %08x)\n",
-			(u32)d->desc, (u32)d->desc->buffer2);
+		dev_dbg(&vb->pdev->dev, "desc: %p (next: %08x)\n",
+			(void*)d->desc, d->desc->buffer2);
 		d->desc->buffer1 = vb->idle_vbb_dma_addr;
 		d->pending = vb->idle_vbb;
 		SET_OWNED(d->desc);
@@ -1138,8 +1139,8 @@
 	WARN_ON(!OWNED(get_prev_descriptor(&vb->txd, next)->desc));
 	set_bit(TX_RECOVERING, &vb->flags);
 
-	dev_dbg(&vb->pdev->dev, "Setting tail to %08x (head: %08x)\n",
-		(u32)next->desc, (u32)vb->txd.head->desc);
+	dev_dbg(&vb->pdev->dev, "Setting tail to %p (head: %p)\n",
+		next->desc, vb->txd.head->desc);
 }
 
 static void stop_tx_descriptor_list_recovery(struct voicebus *vb)