diff options
| author | Mike Isely <isely@pobox.com> | 2006-03-17 18:30:29 -0600 |
|---|---|---|
| committer | Mike Isely <isely@pobox.com> | 2006-03-17 18:30:29 -0600 |
| commit | 09b18d418a428399b3c393492efb0c8db4f70ea1 (patch) | |
| tree | 27be2cdcedf2e1e76427ff7fcec136983caf1264 /linux/drivers/media/video/saa7134/saa7134-oss.c | |
| parent | 0c57b11076a797902550b9f74763718edb825483 (diff) | |
| parent | b76cf1534a48158bfbafe1ed5497621198877e06 (diff) | |
| download | mediapointer-dvb-s2-09b18d418a428399b3c393492efb0c8db4f70ea1.tar.gz mediapointer-dvb-s2-09b18d418a428399b3c393492efb0c8db4f70ea1.tar.bz2 | |
Merge from master
From: Mike Isely <isely@pobox.com>
Signed-off-by: Mike Isely <isely@pobox.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-oss.c')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-oss.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-oss.c b/linux/drivers/media/video/saa7134/saa7134-oss.c index b57fa81cd..a88f8b5bb 100644 --- a/linux/drivers/media/video/saa7134/saa7134-oss.c +++ b/linux/drivers/media/video/saa7134/saa7134-oss.c @@ -143,7 +143,7 @@ static int dsp_rec_start(struct saa7134_dev *dev) unsigned long flags; /* prepare buffer */ - if (0 != (err = videobuf_dma_pci_map(dev->pci,&dev->dmasound.dma))) + if (0 != (err = videobuf_pci_dma_map(dev->pci,&dev->dmasound.dma))) return err; if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->dmasound.pt))) goto fail1; @@ -232,7 +232,7 @@ static int dsp_rec_start(struct saa7134_dev *dev) fail2: saa7134_pgtable_free(dev->pci,&dev->dmasound.pt); fail1: - videobuf_dma_pci_unmap(dev->pci,&dev->dmasound.dma); + videobuf_pci_dma_unmap(dev->pci,&dev->dmasound.dma); return err; } @@ -250,7 +250,7 @@ static int dsp_rec_stop(struct saa7134_dev *dev) /* unlock buffer */ saa7134_pgtable_free(dev->pci,&dev->dmasound.pt); - videobuf_dma_pci_unmap(dev->pci,&dev->dmasound.dma); + videobuf_pci_dma_unmap(dev->pci,&dev->dmasound.dma); return 0; } |