diff options
| author | Mark Brown | 2014-05-13 19:23:56 +0200 |
|---|---|---|
| committer | Mark Brown | 2014-05-13 19:23:56 +0200 |
| commit | 8bee1fd482622718fcc1a537db1d7ca48d7f52f8 (patch) | |
| tree | 8b40cf912a942771b0b22f2aa0ac20d5af256010 /sound/soc/intel/sst-baytrail-dsp.c | |
| parent | ASoC: Intel: Use ACPI device for Baytrail PCM buffer allocation (diff) | |
| parent | ASoC: Intel: Fix Baytrail SST DSP firmware loading (diff) | |
| download | kernel-qcow2-linux-8bee1fd482622718fcc1a537db1d7ca48d7f52f8.tar.gz kernel-qcow2-linux-8bee1fd482622718fcc1a537db1d7ca48d7f52f8.tar.xz kernel-qcow2-linux-8bee1fd482622718fcc1a537db1d7ca48d7f52f8.zip | |
Merge branch 'fix/intel' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-intel
Conflicts:
sound/soc/intel/sst-baytrail-dsp.c
Diffstat (limited to 'sound/soc/intel/sst-baytrail-dsp.c')
| -rw-r--r-- | sound/soc/intel/sst-baytrail-dsp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/intel/sst-baytrail-dsp.c b/sound/soc/intel/sst-baytrail-dsp.c index 4a5d489e520b..fc588764ffa3 100644 --- a/sound/soc/intel/sst-baytrail-dsp.c +++ b/sound/soc/intel/sst-baytrail-dsp.c @@ -324,7 +324,7 @@ static int sst_byt_init(struct sst_dsp *sst, struct sst_pdata *pdata) return ret; } - ret = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(32)); + ret = dma_coerce_mask_and_coherent(sst->dma_dev, DMA_BIT_MASK(32)); if (ret) return ret; |