diff options
| author | Mark Brown <[email protected]> | 2018-06-05 12:27:30 +0100 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2018-06-05 12:27:30 +0100 |
| commit | 2858e2cfc2ef6501bc9a8cccf847a4ee58b5c9bf (patch) | |
| tree | 2c8387e353d06a3510c8d160eff2ebcacb00e12c /include | |
| parent | 29dcea88779c856c7dc92040a0c01233263101d4 (diff) | |
| parent | c90ddb69d4b24bc32edf9c7bcfec85e52427d1c1 (diff) | |
Merge branch 'asoc-4.17' into asoc-linus
Diffstat (limited to 'include')
| -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; |