diff options
author | Mark Brown <broonie@kernel.org> | 2019-03-18 11:15:09 +0000 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2019-03-18 11:15:09 +0000 |
commit | 127470597b6b9466872d9794a80804ec95fff8ea (patch) | |
tree | b0087938a7f980c5b3d3879e0c2d18bab45d78e8 /sound/ppc/snd_ps3.c | |
parent | 3789debfc379ac84b90e2db32d7a6b66d28a2c7c (diff) | |
parent | 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b (diff) | |
download | linux-127470597b6b9466872d9794a80804ec95fff8ea.tar.gz linux-127470597b6b9466872d9794a80804ec95fff8ea.tar.bz2 linux-127470597b6b9466872d9794a80804ec95fff8ea.zip |
Merge tag 'v5.1-rc1' into asoc-5.2
Linux 5.1-rc1
Diffstat (limited to 'sound/ppc/snd_ps3.c')
-rw-r--r-- | sound/ppc/snd_ps3.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index abe031c9d592..521236efcc4d 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c @@ -1024,15 +1024,11 @@ static int snd_ps3_driver_probe(struct ps3_system_bus_device *dev) the_card.pcm->info_flags = SNDRV_PCM_INFO_NONINTERLEAVED; /* pre-alloc PCM DMA buffer*/ - ret = snd_pcm_lib_preallocate_pages_for_all(the_card.pcm, + snd_pcm_lib_preallocate_pages_for_all(the_card.pcm, SNDRV_DMA_TYPE_DEV, &dev->core, SND_PS3_PCM_PREALLOC_SIZE, SND_PS3_PCM_PREALLOC_SIZE); - if (ret < 0) { - pr_info("%s: prealloc failed\n", __func__); - goto clean_card; - } /* * allocate null buffer |