diff options
| author | Guido Guenther <agx@sigxcpu.org> | 2005-11-16 00:08:44 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-11-16 00:08:44 -0800 |
| commit | 574780d56fdafe2c8ea98660a932760dfea9bffc (patch) | |
| tree | 492e34919f14ffede70dae0ac6f0414fa701d564 /drivers/media/dvb/cinergyT2/cinergyT2.c | |
| parent | f6ff56cd56b83d8edf4b3cffc5c53c56b37a5081 (diff) | |
| download | linux-574780d56fdafe2c8ea98660a932760dfea9bffc.tar.gz linux-574780d56fdafe2c8ea98660a932760dfea9bffc.tar.bz2 linux-574780d56fdafe2c8ea98660a932760dfea9bffc.zip | |
[SPARC64]: Oops in pci_alloc_consistent with cingergyT2
From: Guido Guenther <agx@sigxcpu.org>
- Use correct API for allocating and freeing DMA buffers.
Acked-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/media/dvb/cinergyT2/cinergyT2.c')
| -rw-r--r-- | drivers/media/dvb/cinergyT2/cinergyT2.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/dvb/cinergyT2/cinergyT2.c b/drivers/media/dvb/cinergyT2/cinergyT2.c index a1607e7d6d6b..2dfd7cd160de 100644 --- a/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -276,7 +276,7 @@ static void cinergyt2_free_stream_urbs (struct cinergyt2 *cinergyt2) if (cinergyt2->stream_urb[i]) usb_free_urb(cinergyt2->stream_urb[i]); - pci_free_consistent(NULL, STREAM_URB_COUNT*STREAM_BUF_SIZE, + usb_buffer_free(cinergyt2->udev, STREAM_URB_COUNT*STREAM_BUF_SIZE, cinergyt2->streambuf, cinergyt2->streambuf_dmahandle); } @@ -284,9 +284,8 @@ static int cinergyt2_alloc_stream_urbs (struct cinergyt2 *cinergyt2) { int i; - cinergyt2->streambuf = pci_alloc_consistent(NULL, - STREAM_URB_COUNT*STREAM_BUF_SIZE, - &cinergyt2->streambuf_dmahandle); + cinergyt2->streambuf = usb_buffer_alloc(cinergyt2->udev, STREAM_URB_COUNT*STREAM_BUF_SIZE, + SLAB_KERNEL, &cinergyt2->streambuf_dmahandle); if (!cinergyt2->streambuf) { dprintk(1, "failed to alloc consistent stream memory area, bailing out!\n"); return -ENOMEM; |