Intel: ASoC: remove duplicated code on merge

From: "Lu, Han" <[email protected]>

index d4865a6..43fb5f3 100644
@@ -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

Please include a commit description explaining what the problem you're trying to fix is (like where the two different copies came from). I've tweaked the way the merges are being done which I think has stopped this happening, can you check please?

Hi Mark,

My patch was trying to fix the error introduced by commit 527cab6 in branch for-next, where the code block of "allocate scratch mem regions" appears twice.
However, I see the issue has been fixed and no duplicated code found in latest branch, so my patch is not required anymore, please ignore it. Thanks.

BR,
Han Lu