Merge remote-tracking branch 'asoc/for-4.17' into asoc-4.18 to resolve a

conflict between a fix and new development in mtk
2018-05-02 06:12:18 +09:00
parent 9e6a469ec7 40c5796378
commit 783ec5e99a
4 changed files with 18 additions and 16 deletions
--- 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;