Don't like ads? PRO users don't see any ads ;-)
Guest

Untitled

By: a guest on Aug 30th, 2010  |  syntax: Diff  |  size: 1.30 KB  |  hits: 110  |  expires: Never
download  |  raw  |  embed  |  report abuse  |  print
Text below is selected. Please press Ctrl+C to copy to your clipboard. (⌘+C on Mac)
  1. diff -Naur a/drivers/dahdi/voicebus/GpakCust.h b/drivers/dahdi/voicebus/GpakCust.h
  2. --- a/drivers/dahdi/voicebus/GpakCust.h 2010-05-14 18:02:21.000000000 +0200
  3. +++ b/drivers/dahdi/voicebus/GpakCust.h 2010-08-30 10:20:05.960000032 +0200
  4. @@ -40,6 +40,7 @@
  5.  #include <linux/completion.h>
  6.  #include <linux/workqueue.h>
  7.  #include <linux/delay.h>
  8. +#include <linux/semaphore.h>
  9.  
  10.  #include "gpakenum.h"
  11.  #include "adt_lec.h"
  12. diff -Naur a/drivers/dahdi/xpp/xpp_usb.c b/drivers/dahdi/xpp/xpp_usb.c
  13. --- a/drivers/dahdi/xpp/xpp_usb.c 2009-08-13 22:25:16.000000000 +0200
  14. +++ b/drivers/dahdi/xpp/xpp_usb.c 2010-08-30 10:19:09.650000027 +0200
  15. @@ -308,7 +308,7 @@
  16.     return NULL;
  17.   }
  18.   usb_init_urb(&uframe->urb);
  19. - p = usb_buffer_alloc(xusb->udev, size, gfp_flags, &uframe->urb.transfer_dma);
  20. + p = usb_alloc_coherent(xusb->udev, size, gfp_flags, &uframe->urb.transfer_dma);
  21.   if(!p) {
  22.     if((rate_limit++ % 1003) == 0)
  23.       XUSB_ERR(xusb, "buffer allocation failed (%d)\n", rate_limit);
  24. @@ -330,7 +330,7 @@
  25.  
  26.   BUG_ON(xbus->transport.priv != uframe->xusb);
  27.   //XUSB_INFO(uframe->xusb, "frame_free\n");
  28. - usb_buffer_free(urb->dev, uframe->transfer_buffer_length,
  29. + usb_free_coherent(urb->dev, uframe->transfer_buffer_length,
  30.       urb->transfer_buffer,
  31.       urb->transfer_dma);
  32.   memset(uframe, 0, sizeof(*uframe));