diff options
Diffstat (limited to 'drivers/media/dvb/dvb-usb/usb-urb.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/usb-urb.c | 7 |
1 files changed, 4 insertions, 3 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) | |||
96 | while (stream->buf_num) { | 96 | while (stream->buf_num) { |
97 | stream->buf_num--; | 97 | stream->buf_num--; |
98 | deb_mem("freeing buffer %d\n",stream->buf_num); | 98 | deb_mem("freeing buffer %d\n",stream->buf_num); |
99 | usb_buffer_free(stream->udev, stream->buf_size, | 99 | usb_free_coherent(stream->udev, stream->buf_size, |
100 | stream->buf_list[stream->buf_num], stream->dma_addr[stream->buf_num]); | 100 | stream->buf_list[stream->buf_num], |
101 | stream->dma_addr[stream->buf_num]); | ||
101 | } | 102 | } |
102 | } | 103 | } |
103 | 104 | ||
@@ -116,7 +117,7 @@ static int usb_allocate_stream_buffers(struct usb_data_stream *stream, int num, | |||
116 | for (stream->buf_num = 0; stream->buf_num < num; stream->buf_num++) { | 117 | for (stream->buf_num = 0; stream->buf_num < num; stream->buf_num++) { |
117 | deb_mem("allocating buffer %d\n",stream->buf_num); | 118 | deb_mem("allocating buffer %d\n",stream->buf_num); |
118 | if (( stream->buf_list[stream->buf_num] = | 119 | if (( stream->buf_list[stream->buf_num] = |
119 | usb_buffer_alloc(stream->udev, size, GFP_ATOMIC, | 120 | usb_alloc_coherent(stream->udev, size, GFP_ATOMIC, |
120 | &stream->dma_addr[stream->buf_num]) ) == NULL) { | 121 | &stream->dma_addr[stream->buf_num]) ) == NULL) { |
121 | deb_mem("not enough memory for urb-buffer allocation.\n"); | 122 | deb_mem("not enough memory for urb-buffer allocation.\n"); |
122 | usb_free_stream_buffers(stream); | 123 | usb_free_stream_buffers(stream); |