Skip to content

Commit fd1d918

Browse files
bwhacksdavem330
authored andcommitted
via-ircc: Pass PCI device pointer to dma_{alloc, free}_coherent()
via-ircc has been passing a NULL pointer to DMA allocation functions, which is completely invalid and results in a BUG on PowerPC. Now that we always have the device pointer available, pass it in. Reference: http://bugs.debian.org/619450 Reported-by: Andrew Buckeridge <[email protected]> Signed-off-by: Ben Hutchings <[email protected]> Tested-by: Andrew Buckeridge <[email protected]> [against 2.6.32] Signed-off-by: David S. Miller <[email protected]>
1 parent abc4559 commit fd1d918

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/net/irda/via-ircc.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ static __devinit int via_ircc_open(struct pci_dev *pdev, chipio_t * info,
363363

364364
/* Allocate memory if needed */
365365
self->rx_buff.head =
366-
dma_alloc_coherent(NULL, self->rx_buff.truesize,
366+
dma_alloc_coherent(&pdev->dev, self->rx_buff.truesize,
367367
&self->rx_buff_dma, GFP_KERNEL);
368368
if (self->rx_buff.head == NULL) {
369369
err = -ENOMEM;
@@ -372,7 +372,7 @@ static __devinit int via_ircc_open(struct pci_dev *pdev, chipio_t * info,
372372
memset(self->rx_buff.head, 0, self->rx_buff.truesize);
373373

374374
self->tx_buff.head =
375-
dma_alloc_coherent(NULL, self->tx_buff.truesize,
375+
dma_alloc_coherent(&pdev->dev, self->tx_buff.truesize,
376376
&self->tx_buff_dma, GFP_KERNEL);
377377
if (self->tx_buff.head == NULL) {
378378
err = -ENOMEM;
@@ -404,10 +404,10 @@ static __devinit int via_ircc_open(struct pci_dev *pdev, chipio_t * info,
404404
via_hw_init(self);
405405
return 0;
406406
err_out4:
407-
dma_free_coherent(NULL, self->tx_buff.truesize,
407+
dma_free_coherent(&pdev->dev, self->tx_buff.truesize,
408408
self->tx_buff.head, self->tx_buff_dma);
409409
err_out3:
410-
dma_free_coherent(NULL, self->rx_buff.truesize,
410+
dma_free_coherent(&pdev->dev, self->rx_buff.truesize,
411411
self->rx_buff.head, self->rx_buff_dma);
412412
err_out2:
413413
release_region(self->io.fir_base, self->io.fir_ext);
@@ -441,10 +441,10 @@ static void __devexit via_remove_one(struct pci_dev *pdev)
441441
__func__, self->io.fir_base);
442442
release_region(self->io.fir_base, self->io.fir_ext);
443443
if (self->tx_buff.head)
444-
dma_free_coherent(NULL, self->tx_buff.truesize,
444+
dma_free_coherent(&pdev->dev, self->tx_buff.truesize,
445445
self->tx_buff.head, self->tx_buff_dma);
446446
if (self->rx_buff.head)
447-
dma_free_coherent(NULL, self->rx_buff.truesize,
447+
dma_free_coherent(&pdev->dev, self->rx_buff.truesize,
448448
self->rx_buff.head, self->rx_buff_dma);
449449
pci_set_drvdata(pdev, NULL);
450450

0 commit comments

Comments
 (0)