[alsa-devel] [PATCH 1/1] Intel: ASoC: remove duplicated code on merge

[han.lu at intel.com]

From: "Lu, Han" <han.lu at intel.com>

Signed-off-by: Lu, Han <han.lu at intel.com>

diff --git a/sound/soc/intel/sst-haswell-ipc.c b/sound/soc/intel/sst-haswell-ipc.c
index d4865a6..43fb5f3 100644
--- a/sound/soc/intel/sst-haswell-ipc.c
+++ b/sound/soc/intel/sst-haswell-ipc.c
@@ -2363,11 +2363,6 @@ int sst_hsw_dsp_init(struct device *dev, struct sst_pdata *pdata)
 	/* init param buffer */
 	sst_hsw_reset_param_buf(hsw);
 
-	/* allocate scratch mem regions */
-	ret = sst_block_alloc_scratch(hsw->dsp);
-	if (ret < 0)
-		goto boot_err;
-
 	/* wait for DSP boot completion */
 	sst_dsp_boot(hsw->dsp);
 	ret = wait_event_timeout(hsw->boot_wait, hsw->boot_complete,
-- 
1.9.1