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

[SVN commits to the DAHDI project]

Author: sruffell
Date: Thu Oct  1 15:42:55 2009
New Revision: 7304

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=7304
Log:
wip: Set the DMA mask && check for idle_vbb on rxd.

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=7304&r1=7303&r2=7304
==============================================================================
--- 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:55 2009
@@ -932,7 +932,7 @@
 	d = dl->tail;
 
 	/* Do not overwrite a buffer that is still in progress. */
-	if (unlikely(d->desc->buffer1)) {
+	if (unlikely(d->desc->buffer1 != vb->idle_vbb_dma_addr)) {
 		WARN_ON(1);
 		voicebus_free(vb, vbb);
 	}
@@ -1882,6 +1882,12 @@
 		goto cleanup;
 	}
 
+	if (pci_set_dma_mask(vb->pdev, DMA_BIT_MASK(32))) {
+		release_region(vb->iobase, 0xff);
+		dev_err(&vb->pdev->dev, "No suitable DMA available.\n");
+		return -EIO;
+	}
+
 	vb->idle_vbb = dma_alloc_coherent(&vb->pdev->dev, vb->framesize,
 					  &vb->idle_vbb_dma_addr, GFP_KERNEL);
 	if (!vb->idle_vbb) {