diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-18 06:53:45 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-18 06:53:45 -0500 |
| commit | 14d44e2c2cb2ef3c88c5090a2d419772e15e7a16 (patch) | |
| tree | c7f96e1c3305eb93a1affd449cc41b99277716d6 /sound/pcmcia | |
| parent | 67cbf8a216259dceefe570f6dc14746f43b2e627 (diff) | |
| parent | 3e85fd614c7b6bb7f33bb04a0dcb5a3bfca4c0fe (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'sound/pcmcia')
| -rw-r--r-- | sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c index d057e6489643..5cfa608823f7 100644 --- a/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c +++ b/sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | |||
| @@ -51,7 +51,7 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs, size_t s | |||
| 51 | return 0; /* already enough large */ | 51 | return 0; /* already enough large */ |
| 52 | vfree(runtime->dma_area); | 52 | vfree(runtime->dma_area); |
| 53 | } | 53 | } |
| 54 | runtime->dma_area = vmalloc_32(size); | 54 | runtime->dma_area = vmalloc_32_user(size); |
| 55 | if (! runtime->dma_area) | 55 | if (! runtime->dma_area) |
| 56 | return -ENOMEM; | 56 | return -ENOMEM; |
| 57 | runtime->dma_bytes = size; | 57 | runtime->dma_bytes = size; |