[svn-commits] sruffell: branch linux/sruffell/dahdi-linux-transcoder r6045 - in /linux/team...

[SVN commits to the Digium repositories]

Author: sruffell
Date: Thu Feb 26 19:47:11 2009
New Revision: 6045

URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6045
Log:
Merged revisions 6005 via svnmerge from 
https://origsvn.digium.com/svn/dahdi/linux/trunk

........
  r6005 | sruffell | 2009-02-10 23:41:56 -0600 (Tue, 10 Feb 2009) | 2 lines
  
  Use the proper pci_device when handling dma buffers.
........

Modified:
    linux/team/sruffell/dahdi-linux-transcoder/   (props changed)
    linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wctc4xxp/base.c

Propchange: linux/team/sruffell/dahdi-linux-transcoder/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb 26 19:47:11 2009
@@ -1,1 +1,1 @@
-/linux/trunk:1-5999
+/linux/trunk:1-6042

Modified: linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wctc4xxp/base.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=6045&r1=6044&r2=6045
==============================================================================
--- linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wctc4xxp/base.c (original)
+++ linux/team/sruffell/dahdi-linux-transcoder/drivers/dahdi/wctc4xxp/base.c Thu Feb 26 19:47:11 2009
@@ -558,7 +558,7 @@
 
 	count = wctc4xxp_net_receive(wc, budget);
 
-	if (!skb_queue_len(&wc->captured_packets))
+	if (!skb_queue_len(&wc->captured_packets)) {
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29)
 		netif_rx_complete(wc->netdev, &wc->napi);
 #else
@@ -845,6 +845,7 @@
 	d->des1 |= cpu_to_le32(END_OF_RING);
 	dr->direction = direction;
 	spin_lock_init(&dr->lock);
+	dr->pdev = pdev;
 	return 0;
 }
 
@@ -1445,8 +1446,8 @@
 	for (i = 0; i < DRING_SIZE; ++i) {
 		d = wctc4xxp_descriptor(dr, i);
 		if (d->buffer1) {
-			dma_unmap_single(&dr->pdev->dev, d->buffer1,
-				SFRAME_SIZE, dr->direction);
+			pci_unmap_single(dr->pdev, d->buffer1, 
+			                 SFRAME_SIZE, dr->direction);
 			d->buffer1 = 0;
 			/* Commands will also be sitting on the waiting for
 			 * response list, so we want to make sure to delete