2 files changed, 7 insertions, 6 deletions

diff --git a/drivers/media/dvb/dvb-usb/usb-urb.c b/drivers/media/dvb/dvb-usb/usb-urb.c
index f9702e3756b6..86d68933b6b4 100644
--- a/drivers/media/dvb/dvb-usb/usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/usb-urb.c
@@ -96,8 +96,9 @@ static int usb_free_stream_buffers(struct usb_data_stream *stream)
                 while (stream->buf_num) {
                         stream->buf_num--;
                         deb_mem("freeing buffer %d\n",stream->buf_num);
-                        usb_buffer_free(stream->udev, stream->buf_size,
-                                        stream->buf_list[stream->buf_num], stream->dma_addr[stream->buf_num]);
+                        usb_free_coherent(stream->udev, stream->buf_size,
+                                          stream->buf_list[stream->buf_num],
+                                          stream->dma_addr[stream->buf_num]);
                 }
         }
 
@@ -116,7 +117,7 @@ static int usb_allocate_stream_buffers(struct usb_data_stream *stream, int num,
         for (stream->buf_num = 0; stream->buf_num < num; stream->buf_num++) {
                 deb_mem("allocating buffer %d\n",stream->buf_num);
                 if (( stream->buf_list[stream->buf_num] =
-                                        usb_buffer_alloc(stream->udev, size, GFP_ATOMIC,
+                                        usb_alloc_coherent(stream->udev, size, GFP_ATOMIC,
                                         &stream->dma_addr[stream->buf_num]) ) == NULL) {
                         deb_mem("not enough memory for urb-buffer allocation.\n");
                         usb_free_stream_buffers(stream);
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index 53baccbab17f..fe1b8037b247 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -1257,7 +1257,7 @@ static int ttusb_dec_init_usb(struct ttusb_dec *dec)
                 if(!dec->irq_urb) {
                         return -ENOMEM;
                 }
-                dec->irq_buffer = usb_buffer_alloc(dec->udev,IRQ_PACKET_SIZE,
+                dec->irq_buffer = usb_alloc_coherent(dec->udev,IRQ_PACKET_SIZE,
                                         GFP_ATOMIC, &dec->irq_dma_handle);
                 if(!dec->irq_buffer) {
                         usb_free_urb(dec->irq_urb);
@@ -1550,8 +1550,8 @@ static void ttusb_dec_exit_rc(struct ttusb_dec *dec)
 
         usb_free_urb(dec->irq_urb);
 
-        usb_buffer_free(dec->udev,IRQ_PACKET_SIZE,
-                           dec->irq_buffer, dec->irq_dma_handle);
+        usb_free_coherent(dec->udev,IRQ_PACKET_SIZE,
+                          dec->irq_buffer, dec->irq_dma_handle);
 
         if (dec->rc_input_dev) {
                 input_unregister_device(dec->rc_input_dev);