From def82e468552fab24fd8898bb5c9d0674950c848 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Fri, 1 Apr 2011 16:23:45 +0200 Subject: [PATCH] --- yaml --- r: 249084 b: refs/heads/master c: 48c59f4b915caf4007e6d5a1f34b10fe10210b72 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/intel_sst/intel_sst_app_interface.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 03fec17cb491..a954bf61b371 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60d5c9f5b6a2f5ce09712b7f7d0b0bf979a150be +refs/heads/master: 48c59f4b915caf4007e6d5a1f34b10fe10210b72 diff --git a/trunk/drivers/staging/intel_sst/intel_sst_app_interface.c b/trunk/drivers/staging/intel_sst/intel_sst_app_interface.c index 1d0621260ea8..d7454e210aae 100644 --- a/trunk/drivers/staging/intel_sst/intel_sst_app_interface.c +++ b/trunk/drivers/staging/intel_sst/intel_sst_app_interface.c @@ -418,10 +418,6 @@ static int snd_sst_fill_kernel_list(struct stream_info *stream, static int sent_offset; static unsigned long sent_index; - stream_bufs = kzalloc(sizeof(*stream_bufs), GFP_KERNEL); - if (!stream_bufs) - return -ENOMEM; - stream_bufs->addr = sst_drv_ctx->mmap_mem; #ifdef CONFIG_MRST_RAR_HANDLER if (stream->ops == STREAM_OPS_PLAYBACK_DRM) { for (index = stream->sg_index; index < nr_segs; index++) { @@ -448,6 +444,10 @@ static int snd_sst_fill_kernel_list(struct stream_info *stream, return retval; } #endif + stream_bufs = kzalloc(sizeof(*stream_bufs), GFP_KERNEL); + if (!stream_bufs) + return -ENOMEM; + stream_bufs->addr = sst_drv_ctx->mmap_mem; mmap_len = sst_drv_ctx->mmap_len; stream_bufs->addr = sst_drv_ctx->mmap_mem; bufp = stream->cur_ptr;