Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork

Configure Feed

Select the types of activity you want to include in your feed.

[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>

authored by

Guido Guenther and committed by
David S. Miller
574780d5 f6ff56cd

+3 -4
+3 -4
drivers/media/dvb/cinergyT2/cinergyT2.c
··· 276 276 if (cinergyt2->stream_urb[i]) 277 277 usb_free_urb(cinergyt2->stream_urb[i]); 278 278 279 - pci_free_consistent(NULL, STREAM_URB_COUNT*STREAM_BUF_SIZE, 279 + usb_buffer_free(cinergyt2->udev, STREAM_URB_COUNT*STREAM_BUF_SIZE, 280 280 cinergyt2->streambuf, cinergyt2->streambuf_dmahandle); 281 281 } 282 282 ··· 284 284 { 285 285 int i; 286 286 287 - cinergyt2->streambuf = pci_alloc_consistent(NULL, 288 - STREAM_URB_COUNT*STREAM_BUF_SIZE, 289 - &cinergyt2->streambuf_dmahandle); 287 + cinergyt2->streambuf = usb_buffer_alloc(cinergyt2->udev, STREAM_URB_COUNT*STREAM_BUF_SIZE, 288 + SLAB_KERNEL, &cinergyt2->streambuf_dmahandle); 290 289 if (!cinergyt2->streambuf) { 291 290 dprintk(1, "failed to alloc consistent stream memory area, bailing out!\n"); 292 291 return -ENOMEM;