Merge branches 'topic/fix/hda' and 'topic/fix/sound-core' into for-linus

[linux-2.6-omap-h63xx.git] / drivers / media / dvb / dvb-usb / usb-urb.c

diff --git a/drivers/media/dvb/dvb-usb/usb-urb.c b/drivers/media/dvb/dvb-usb/usb-urb.c
index 8728cf347a717959adb4611892174d2d99adab02..397f51a7b2ada50abe6078540f6f37ae25edef85 100644 (file)
--- a/drivers/media/dvb/dvb-usb/usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/usb-urb.c
@@ -11,7 +11,7 @@
 #include "dvb-usb-common.h"
 
 /* URB stuff for streaming */
-static void usb_urb_complete(struct urb *urb, struct pt_regs *ptregs)
+static void usb_urb_complete(struct urb *urb)
 {
        struct usb_data_stream *stream = urb->context;
        int ptype = usb_pipetype(urb->pipe);
@@ -116,14 +116,15 @@ 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, SLAB_ATOMIC,
+                                       usb_buffer_alloc(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);
                        return -ENOMEM;
                }
-               deb_mem("buffer %d: %p (dma: %u)\n",
-                       stream->buf_num, stream->buf_list[stream->buf_num], stream->dma_addr[stream->buf_num]);
+               deb_mem("buffer %d: %p (dma: %Lu)\n",
+                       stream->buf_num,
+stream->buf_list[stream->buf_num], (long long)stream->dma_addr[stream->buf_num]);
                memset(stream->buf_list[stream->buf_num],0,size);
                stream->state |= USB_STATE_URB_BUF;
        }