ASoC: soc-generic-dmaengine-pcm: separate max_buffer_size assignment

[linux-2.6-microblaze.git] / sound / soc / soc-generic-dmaengine-pcm.c

diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index c54c8ca..8659cb1 100644 (file)
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -237,13 +237,15 @@ static int dmaengine_pcm_new(struct snd_soc_component *component,
        size_t max_buffer_size;
        unsigned int i;
 
-       if (config && config->prealloc_buffer_size) {
+       if (config && config->prealloc_buffer_size)
                prealloc_buffer_size = config->prealloc_buffer_size;
-               max_buffer_size = config->pcm_hardware->buffer_bytes_max;
-       } else {
+       else
                prealloc_buffer_size = prealloc_buffer_size_kbytes * 1024;
+
+       if (config && config->pcm_hardware && config->pcm_hardware->buffer_bytes_max)
+               max_buffer_size = config->pcm_hardware->buffer_bytes_max;
+       else
                max_buffer_size = SIZE_MAX;
-       }
 
        for_each_pcm_streams(i) {
                struct snd_pcm_substream *substream = rtd->pcm->streams[i].substream;