diff options
| author | Daniel Wagner <wagi@monom.org> | 2018-06-14 08:06:36 +0200 |
|---|---|---|
| committer | Daniel Wagner <wagi@monom.org> | 2018-06-14 08:06:36 +0200 |
| commit | c1c4634fa74a1b0edca034ea7b06fb4344d0a8af (patch) | |
| tree | 84e3387af3d1cb09e9967f578c51a82e0d7be7ea /sound | |
| parent | a5a16942c538b5b6a4118561270d69ab7fac60c7 (diff) | |
| parent | dc45cafe612ec6960fe728f3260a0b751c73f4aa (diff) | |
| download | linux-rt-c1c4634fa74a1b0edca034ea7b06fb4344d0a8af.tar.gz | |
Merge tag 'v4.4.136' into v4.4-rt
This is the 4.4.136 stable release
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/intel/common/sst-firmware.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/intel/common/sst-firmware.c b/sound/soc/intel/common/sst-firmware.c index 1636a1eeb002..be1b69c63bdf 100644 --- a/sound/soc/intel/common/sst-firmware.c +++ b/sound/soc/intel/common/sst-firmware.c @@ -260,7 +260,6 @@ int sst_dma_new(struct sst_dsp *sst) struct sst_pdata *sst_pdata = sst->pdata; struct sst_dma *dma; struct resource mem; - const char *dma_dev_name; int ret = 0; if (sst->pdata->resindex_dma_base == -1) @@ -271,7 +270,6 @@ int sst_dma_new(struct sst_dsp *sst) * is attached to the ADSP IP. */ switch (sst->pdata->dma_engine) { case SST_DMA_TYPE_DW: - dma_dev_name = "dw_dmac"; break; default: dev_err(sst->dev, "error: invalid DMA engine %d\n", |