diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2005-11-17 10:44:51 +0100 |
|---|---|---|
| committer |   Jaroslav Kysela <perex@suse.cz> | 2006-01-03 12:17:06 +0100 |
| commit | e017fa5772cd2536b2b2fb210f5a6e86cceaa633 (patch) | |
| tree | 7ab4eb659c9b88d6754ba1ca602030f3e4e0964f /sound/pci/emu10k1 | |
| parent | [ALSA] emu10k1x - Minor clean up (diff) | |
| download | linux-dev-e017fa5772cd2536b2b2fb210f5a6e86cceaa633.tar.xz linux-dev-e017fa5772cd2536b2b2fb210f5a6e86cceaa633.zip | |
[ALSA] emu10k1 - Minor clean up of memory block handling
Modules: EMU10K1/EMU10K2 driver
Minor clean up of emu10k1 memory block allocation.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/emu10k1')
| -rw-r--r-- | sound/pci/emu10k1/emupcm.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 90d3a0b50d17..166f7c4d28c9 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c @@ -405,15 +405,17 @@ static int snd_emu10k1_playback_hw_params(snd_pcm_substream_t * substream, if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0) return err; if (err > 0) { /* change */ - snd_util_memblk_t *memblk; + int mapped; if (epcm->memblk != NULL) snd_emu10k1_free_pages(emu, epcm->memblk); - memblk = snd_emu10k1_alloc_pages(emu, substream); - if ((epcm->memblk = memblk) == NULL || ((emu10k1_memblk_t *)memblk)->mapped_page < 0) { - epcm->start_addr = 0; + epcm->memblk = snd_emu10k1_alloc_pages(emu, substream); + epcm->start_addr = 0; + if (! epcm->memblk) return -ENOMEM; - } - epcm->start_addr = ((emu10k1_memblk_t *)memblk)->mapped_page << PAGE_SHIFT; + mapped = ((emu10k1_memblk_t *)epcm->memblk)->mapped_page; + if (mapped < 0) + return -ENOMEM; + epcm->start_addr = mapped << PAGE_SHIFT; } return 0; } |