diff --git a/[refs] b/[refs] index 89a4257e021d..7094d09bcbda 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e85fd614c7b6bb7f33bb04a0dcb5a3bfca4c0fe +refs/heads/master: d49464318a7c51676c44cbd1e2480f651cc43807 diff --git a/trunk/sound/arm/aaci.c b/trunk/sound/arm/aaci.c index 1497dce1b04a..ae38f2c342cc 100644 --- a/trunk/sound/arm/aaci.c +++ b/trunk/sound/arm/aaci.c @@ -1028,7 +1028,7 @@ static int __devinit aaci_init_pcm(struct aaci *aaci) snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &aaci_playback_ops); snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &aaci_capture_ops); snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, - NULL, 0, 64 * 104); + NULL, 0, 64 * 1024); } return ret;