
Untitled
By: a guest on
Aug 30th, 2010 | syntax:
Diff | size: 1.30 KB | hits: 110 | expires: Never
diff -Naur a/drivers/dahdi/voicebus/GpakCust.h b/drivers/dahdi/voicebus/GpakCust.h
--- a/drivers/dahdi/voicebus/GpakCust.h 2010-05-14 18:02:21.000000000 +0200
+++ b/drivers/dahdi/voicebus/GpakCust.h 2010-08-30 10:20:05.960000032 +0200
@@ -40,6 +40,7 @@
#include <linux/completion.h>
#include <linux/workqueue.h>
#include <linux/delay.h>
+#include <linux/semaphore.h>
#include "gpakenum.h"
#include "adt_lec.h"
diff -Naur a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c
--- a/drivers/dahdi/xpp/xpp_usb.c 2009-08-13 22:25:16.000000000 +0200
+++ b/drivers/dahdi/xpp/xpp_usb.c 2010-08-30 10:19:09.650000027 +0200
@@ -308,7 +308,7 @@
return NULL;
}
usb_init_urb(&uframe->urb);
- p = usb_buffer_alloc(xusb->udev, size, gfp_flags, &uframe->urb.transfer_dma);
+ p = usb_alloc_coherent(xusb->udev, size, gfp_flags, &uframe->urb.transfer_dma);
if(!p) {
if((rate_limit++ % 1003) == 0)
XUSB_ERR(xusb, "buffer allocation failed (%d)\n", rate_limit);
@@ -330,7 +330,7 @@
BUG_ON(xbus->transport.priv != uframe->xusb);
//XUSB_INFO(uframe->xusb, "frame_free\n");
- usb_buffer_free(urb->dev, uframe->transfer_buffer_length,
+ usb_free_coherent(urb->dev, uframe->transfer_buffer_length,
urb->transfer_buffer,
urb->transfer_dma);
memset(uframe, 0, sizeof(*uframe));