From: Mark Brown <broonie@linaro.org>
Date: Tue, 13 May 2014 17:23:56 +0000 (+0100)
Subject: Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8bee1fd482622718fcc1a537db1d7ca48d7f52f8;p=deliverable%2Flinux.git

Merge branch 'fix/intel' of git://git./linux/kernel/git/broonie/sound into asoc-intel

Conflicts:
	sound/soc/intel/sst-baytrail-dsp.c
---

8bee1fd482622718fcc1a537db1d7ca48d7f52f8
diff --cc sound/soc/intel/sst-baytrail-dsp.c
index 4a5d489e520b,adf0aca5aca6..fc588764ffa3
--- a/sound/soc/intel/sst-baytrail-dsp.c
+++ b/sound/soc/intel/sst-baytrail-dsp.c
@@@ -324,7 -317,14 +324,7 @@@ static int sst_byt_init(struct sst_dsp 
  		return ret;
  	}
  
- 	ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32));
 -	/*
 -	 * save the physical address of extended firmware block in the first
 -	 * 4 bytes of the mailbox
 -	 */
 -	memcpy_toio(sst->addr.lpe + SST_BYT_MAILBOX_OFFSET,
 -	       &pdata->fw_base, sizeof(u32));
 -
+ 	ret = dma_coerce_mask_and_coherent(sst->dma_dev, DMA_BIT_MASK(32));
  	if (ret)
  		return ret;