diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:39:35 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-11 23:39:35 -0500 |
commit | f4256e301d9800b1e0276404cb01b3ac85b51067 (patch) | |
tree | 975f56627b78f757608b31684311a24ca1478481 /drivers/media/dvb/dvb-usb/dvb-usb-urb.c | |
parent | fb2a26b9f8f5eda6b96ba9753edf105e5999d6d9 (diff) | |
parent | cd52d1ee9a92587b242d946a2300a3245d3b885a (diff) |
Merge branch 'master'
Diffstat (limited to 'drivers/media/dvb/dvb-usb/dvb-usb-urb.c')
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c index f5799a4c228e..36b7048c02d2 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-urb.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-urb.c | |||
@@ -196,7 +196,9 @@ static int dvb_usb_allocate_stream_buffers(struct dvb_usb_device *d, int num, un | |||
196 | dvb_usb_free_stream_buffers(d); | 196 | dvb_usb_free_stream_buffers(d); |
197 | return -ENOMEM; | 197 | return -ENOMEM; |
198 | } | 198 | } |
199 | deb_mem("buffer %d: %p (dma: %d)\n",d->buf_num,d->buf_list[d->buf_num],d->dma_addr[d->buf_num]); | 199 | deb_mem("buffer %d: %p (dma: %llu)\n", |
200 | d->buf_num, d->buf_list[d->buf_num], | ||
201 | (unsigned long long)d->dma_addr[d->buf_num]); | ||
200 | memset(d->buf_list[d->buf_num],0,size); | 202 | memset(d->buf_list[d->buf_num],0,size); |
201 | } | 203 | } |
202 | deb_mem("allocation successful\n"); | 204 | deb_mem("allocation successful\n"); |