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

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Oct  1 15:42:57 2009
New Revision: 7306

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7306
Log:
wip: Fix the check if we're in the softunderrun condition.

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=7306&r1=7305&r2=7306
==============================================================================
--- 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:57 2009
@@ -904,7 +904,8 @@
  */
 static bool vb_check_softunderrun(const struct voicebus *vb)
 {
-	return !OWNED(vb->txd.head->desc);
+	const struct voicebus_chained_descriptor *const d = vb->txd.head;
+	return ((d->desc->buffer1 == vb->idle_vbb_dma_addr) && !OWNED(d->desc));
 }
 
 /**
@@ -932,7 +933,9 @@
 		++count;
 	}
 
-	dev_info(&vb->pdev->dev, "Behind by %d descriptors.\n", count);
+	if (printk_ratelimit())
+		dev_info(&vb->pdev->dev, "Behind by %d descriptors.\n", count);
+
 	count = 8;
 	while (--count) {
 		next = get_next_descriptor(dl, next);