aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/saa7134/saa7134-alsa.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-alsa.c')
-rw-r--r--drivers/media/video/saa7134/saa7134-alsa.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c
index ec6bdb9680a3..ba3082422a01 100644
--- a/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/drivers/media/video/saa7134/saa7134-alsa.c
@@ -31,7 +31,7 @@
31#include "saa7134.h" 31#include "saa7134.h"
32#include "saa7134-reg.h" 32#include "saa7134-reg.h"
33 33
34static unsigned int debug = 0; 34static unsigned int debug;
35module_param(debug, int, 0644); 35module_param(debug, int, 0644);
36MODULE_PARM_DESC(debug,"enable debug messages [alsa]"); 36MODULE_PARM_DESC(debug,"enable debug messages [alsa]");
37 37
@@ -503,7 +503,7 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
503 /* release the old buffer */ 503 /* release the old buffer */
504 if (substream->runtime->dma_area) { 504 if (substream->runtime->dma_area) {
505 saa7134_pgtable_free(dev->pci, &dev->dmasound.pt); 505 saa7134_pgtable_free(dev->pci, &dev->dmasound.pt);
506 videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma); 506 videobuf_sg_dma_unmap(&dev->pci->dev, &dev->dmasound.dma);
507 dsp_buffer_free(dev); 507 dsp_buffer_free(dev);
508 substream->runtime->dma_area = NULL; 508 substream->runtime->dma_area = NULL;
509 } 509 }
@@ -519,12 +519,12 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
519 return err; 519 return err;
520 } 520 }
521 521
522 if (0 != (err = videobuf_pci_dma_map(dev->pci, &dev->dmasound.dma))) { 522 if (0 != (err = videobuf_sg_dma_map(&dev->pci->dev, &dev->dmasound.dma))) {
523 dsp_buffer_free(dev); 523 dsp_buffer_free(dev);
524 return err; 524 return err;
525 } 525 }
526 if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->dmasound.pt))) { 526 if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->dmasound.pt))) {
527 videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma); 527 videobuf_sg_dma_unmap(&dev->pci->dev, &dev->dmasound.dma);
528 dsp_buffer_free(dev); 528 dsp_buffer_free(dev);
529 return err; 529 return err;
530 } 530 }
@@ -533,7 +533,7 @@ static int snd_card_saa7134_hw_params(struct snd_pcm_substream * substream,
533 dev->dmasound.dma.sglen, 533 dev->dmasound.dma.sglen,
534 0))) { 534 0))) {
535 saa7134_pgtable_free(dev->pci, &dev->dmasound.pt); 535 saa7134_pgtable_free(dev->pci, &dev->dmasound.pt);
536 videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma); 536 videobuf_sg_dma_unmap(&dev->pci->dev, &dev->dmasound.dma);
537 dsp_buffer_free(dev); 537 dsp_buffer_free(dev);
538 return err; 538 return err;
539 } 539 }
@@ -569,7 +569,7 @@ static int snd_card_saa7134_hw_free(struct snd_pcm_substream * substream)
569 569
570 if (substream->runtime->dma_area) { 570 if (substream->runtime->dma_area) {
571 saa7134_pgtable_free(dev->pci, &dev->dmasound.pt); 571 saa7134_pgtable_free(dev->pci, &dev->dmasound.pt);
572 videobuf_pci_dma_unmap(dev->pci, &dev->dmasound.dma); 572 videobuf_sg_dma_unmap(&dev->pci->dev, &dev->dmasound.dma);
573 dsp_buffer_free(dev); 573 dsp_buffer_free(dev);
574 substream->runtime->dma_area = NULL; 574 substream->runtime->dma_area = NULL;
575 } 575 }