Merge remote-tracking branch 'iommu/next'

[deliverable/linux.git] / sound / soc / intel / atom / sst / sst_pvt.c

diff --git a/sound/soc/intel/atom/sst/sst_pvt.c b/sound/soc/intel/atom/sst/sst_pvt.c
index adb32fefd693a059574674b414abc7d2811985e7..b1e6b8f34a6a797d335e9630b4972842400977f2 100644 (file)
--- a/sound/soc/intel/atom/sst/sst_pvt.c
+++ b/sound/soc/intel/atom/sst/sst_pvt.c
@@ -279,17 +279,15 @@ int sst_prepare_and_post_msg(struct intel_sst_drv *sst,
 
        if (response) {
                ret = sst_wait_timeout(sst, block);
-               if (ret < 0) {
+               if (ret < 0)
                        goto out;
-               } else if(block->data) {
-                       if (!data)
-                               goto out;
-                       *data = kzalloc(block->size, GFP_KERNEL);
-                       if (!(*data)) {
+
+               if (data && block->data) {
+                       *data = kmemdup(block->data, block->size, GFP_KERNEL);
+                       if (!*data) {
                                ret = -ENOMEM;
                                goto out;
-                       } else
-                               memcpy(data, (void *) block->data, block->size);
+                       }
                }
        }
 out: