diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 03:26:34 -0500 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 03:26:34 -0500 |
| commit | 1cb4f624ea38361b6397966470f0a1bed5532483 (patch) | |
| tree | 418b05ddc854b09d64f7d5ee0c78875e42b5f151 /sound/mips/sgio2audio.c | |
| parent | 444c1953d496d272208902ff7010dc70d1f887f0 (diff) | |
| parent | 2c1f1895ef2aa8f0e5497893eff71304aef332e1 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into fixes
Diffstat (limited to 'sound/mips/sgio2audio.c')
| -rw-r--r-- | sound/mips/sgio2audio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c index 8691f4cf6191..f1d9d16b5486 100644 --- a/sound/mips/sgio2audio.c +++ b/sound/mips/sgio2audio.c | |||
| @@ -609,7 +609,7 @@ static int snd_sgio2audio_pcm_hw_params(struct snd_pcm_substream *substream, | |||
| 609 | /* alloc virtual 'dma' area */ | 609 | /* alloc virtual 'dma' area */ |
| 610 | if (runtime->dma_area) | 610 | if (runtime->dma_area) |
| 611 | vfree(runtime->dma_area); | 611 | vfree(runtime->dma_area); |
| 612 | runtime->dma_area = vmalloc(size); | 612 | runtime->dma_area = vmalloc_user(size); |
| 613 | if (runtime->dma_area == NULL) | 613 | if (runtime->dma_area == NULL) |
| 614 | return -ENOMEM; | 614 | return -ENOMEM; |
| 615 | runtime->dma_bytes = size; | 615 | runtime->dma_bytes = size; |