diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-02-26 16:22:47 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-02-26 16:22:47 +0000 |
| commit | 3146089d235b304e665dc551472ae9cb9ab58572 (patch) | |
| tree | d1a9141c302f269cb8468f0d4de78124ea5e389a /sound/soc/intel/haswell | |
| parent | Merge branch 'asoc-5.0' into asoc-linus (diff) | |
| parent | ASoC: stm32: i2s: skip useless write in slave mode (diff) | |
| download | linux-dev-3146089d235b304e665dc551472ae9cb9ab58572.tar.xz linux-dev-3146089d235b304e665dc551472ae9cb9ab58572.zip | |
Merge branch 'asoc-5.1' into asoc-next
Diffstat (limited to 'sound/soc/intel/haswell')
| -rw-r--r-- | sound/soc/intel/haswell/sst-haswell-ipc.c | 2 | ||||
| -rw-r--r-- | sound/soc/intel/haswell/sst-haswell-pcm.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/intel/haswell/sst-haswell-ipc.c b/sound/soc/intel/haswell/sst-haswell-ipc.c index d33bdaf92c57..31fcdf12c67d 100644 --- a/sound/soc/intel/haswell/sst-haswell-ipc.c +++ b/sound/soc/intel/haswell/sst-haswell-ipc.c @@ -1216,7 +1216,7 @@ int sst_hsw_stream_commit(struct sst_hsw *hsw, struct sst_hsw_stream *stream) return ret; } - stream->commited = 1; + stream->commited = true; trace_hsw_stream_alloc_reply(stream); return 0; diff --git a/sound/soc/intel/haswell/sst-haswell-pcm.c b/sound/soc/intel/haswell/sst-haswell-pcm.c index fe2c826e710c..2debcc2ed99a 100644 --- a/sound/soc/intel/haswell/sst-haswell-pcm.c +++ b/sound/soc/intel/haswell/sst-haswell-pcm.c @@ -544,7 +544,7 @@ static int hsw_pcm_hw_params(struct snd_pcm_substream *substream, dev_err(rtd->dev, "error: invalid DAI ID %d\n", rtd->cpu_dai->id); return -EINVAL; - }; + } ret = sst_hsw_stream_format(hsw, pcm_data->stream, path_id, stream_type, SST_HSW_STREAM_FORMAT_PCM_FORMAT); @@ -861,7 +861,7 @@ static int hsw_pcm_close(struct snd_pcm_substream *substream) dev_dbg(rtd->dev, "error: free stream failed %d\n", ret); goto out; } - pcm_data->allocated = 0; + pcm_data->allocated = false; pcm_data->stream = NULL; out: |