summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134-alsa.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-10-18 14:27:43 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-10-18 14:27:43 +0000
commit1ed325647dff4192dc9c400febf3b72887f25a3c (patch)
treea4657a18d091acb23d735f0edc2da84fd2197ecd /linux/drivers/media/video/saa7134/saa7134-alsa.c
parent16a273f4ec7f5c656bd5d7a6c1a5947382b1e4b4 (diff)
downloadmediapointer-dvb-s2-1ed325647dff4192dc9c400febf3b72887f25a3c.tar.gz
mediapointer-dvb-s2-1ed325647dff4192dc9c400febf3b72887f25a3c.tar.bz2
- Cleanup some unnecessary ALSA memory (de/)allocations
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-alsa.c')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-alsa.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-alsa.c b/linux/drivers/media/video/saa7134/saa7134-alsa.c
index 693a38fa6..8c54d29e2 100644
--- a/linux/drivers/media/video/saa7134/saa7134-alsa.c
+++ b/linux/drivers/media/video/saa7134/saa7134-alsa.c
@@ -2,7 +2,7 @@
* SAA713x ALSA support for V4L
* Ricardo Cerqueira <v4l@cerqueira.org>
*
- * $Id: saa7134-alsa.c,v 1.8 2005/10/16 12:34:29 mchehab Exp $
+ * $Id: saa7134-alsa.c,v 1.9 2005/10/18 14:27:43 mchehab Exp $
*
* Caveats:
* - Volume doesn't work (it's always at max)
@@ -530,7 +530,7 @@ static void snd_card_saa7134_runtime_free(snd_pcm_runtime_t *runtime)
*
* Called on initialization, right before the PCM preparation
* Usually used in ALSA to allocate the DMA, but since we don't use the
- * ALSA DMA I'm almost sure this isn't necessary.
+ * ALSA DMA it does nothing
*
*/
@@ -538,7 +538,7 @@ static int snd_card_saa7134_hw_params(snd_pcm_substream_t * substream,
snd_pcm_hw_params_t * hw_params)
{
- return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
+ return 0;
}
@@ -556,7 +556,7 @@ static int snd_card_saa7134_hw_params(snd_pcm_substream_t * substream,
static int snd_card_saa7134_hw_free(snd_pcm_substream_t * substream)
{
- return snd_pcm_lib_free_pages(substream);
+ return 0;
}
/*
@@ -688,9 +688,6 @@ static int snd_card_saa7134_pcm(snd_card_saa7134_t *saa7134, int device)
pcm->private_data = saa7134;
pcm->info_flags = 0;
strcpy(pcm->name, "SAA7134 PCM");
- snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
- snd_dma_pci_data(saa7134->pci),
- 128*1024, 256*1024);
return 0;
}