diff options
| author | Mark Brown <broonie@kernel.org> | 2018-05-02 00:12:18 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-05-02 00:12:18 +0300 |
| commit | 783ec5e99ab9d8839957b15b5836e8bb795d74b6 (patch) | |
| tree | 3b25befe45a3cbf67692fc388da49929f9bfaa85 /include/sound | |
| parent | 9e6a469ec7dabc73043522d21e634583d91cb567 (diff) | |
| parent | 40c57963789d451c26269e3bc9f9e803060fd9af (diff) | |
| download | linux-783ec5e99ab9d8839957b15b5836e8bb795d74b6.tar.xz | |
Merge remote-tracking branch 'asoc/for-4.17' into asoc-4.18 to resolve a
conflict between a fix and new development in mtk
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dai.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h index 8ad11669e4d8..35ebb0be5114 100644 --- a/include/sound/soc-dai.h +++ b/include/sound/soc-dai.h @@ -294,8 +294,8 @@ struct snd_soc_dai { struct snd_soc_dai_driver *driver; /* DAI runtime info */ - unsigned int capture_active:1; /* stream is in use */ - unsigned int playback_active:1; /* stream is in use */ + unsigned int capture_active; /* stream usage count */ + unsigned int playback_active; /* stream usage count */ unsigned int probed:1; unsigned int active; |