diff options
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-alsa.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-alsa.c | 12 |
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 e9ffe8f144ac..e7c3691fc500 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
@@ -277,7 +277,7 @@ static int dsp_buffer_init(struct saa7134_dev *dev) | |||
277 | BUG(); | 277 | BUG(); |
278 | videobuf_dma_init(&dev->oss.dma); | 278 | videobuf_dma_init(&dev->oss.dma); |
279 | err = videobuf_dma_init_kernel(&dev->oss.dma, PCI_DMA_FROMDEVICE, | 279 | err = videobuf_dma_init_kernel(&dev->oss.dma, PCI_DMA_FROMDEVICE, |
280 | (dev->oss.bufsize + PAGE_SIZE) >> PAGE_SHIFT); | 280 | (dev->oss.bufsize + PAGE_SIZE) >> PAGE_SHIFT); |
281 | if (0 != err) | 281 | if (0 != err) |
282 | return err; | 282 | return err; |
283 | return 0; | 283 | return 0; |
@@ -336,9 +336,9 @@ static int snd_card_saa7134_capture_prepare(snd_pcm_substream_t * substream) | |||
336 | if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->oss.pt))) | 336 | if (0 != (err = saa7134_pgtable_alloc(dev->pci,&dev->oss.pt))) |
337 | goto fail1; | 337 | goto fail1; |
338 | if (0 != (err = saa7134_pgtable_build(dev->pci,&dev->oss.pt, | 338 | if (0 != (err = saa7134_pgtable_build(dev->pci,&dev->oss.pt, |
339 | dev->oss.dma.sglist, | 339 | dev->oss.dma.sglist, |
340 | dev->oss.dma.sglen, | 340 | dev->oss.dma.sglen, |
341 | 0))) | 341 | 0))) |
342 | goto fail2; | 342 | goto fail2; |
343 | 343 | ||
344 | 344 | ||
@@ -481,8 +481,8 @@ static snd_pcm_uframes_t snd_card_saa7134_capture_pointer(snd_pcm_substream_t * | |||
481 | static snd_pcm_hardware_t snd_card_saa7134_capture = | 481 | static snd_pcm_hardware_t snd_card_saa7134_capture = |
482 | { | 482 | { |
483 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | | 483 | .info = (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED | |
484 | SNDRV_PCM_INFO_BLOCK_TRANSFER | | 484 | SNDRV_PCM_INFO_BLOCK_TRANSFER | |
485 | SNDRV_PCM_INFO_MMAP_VALID), | 485 | SNDRV_PCM_INFO_MMAP_VALID), |
486 | .formats = USE_FORMATS, | 486 | .formats = USE_FORMATS, |
487 | .rates = USE_RATE, | 487 | .rates = USE_RATE, |
488 | .rate_min = USE_RATE_MIN, | 488 | .rate_min = USE_RATE_MIN, |