diff options
author | Mark Brown <broonie@kernel.org> | 2020-08-25 12:00:43 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2020-08-25 12:00:43 +0200 |
commit | 1959ba4e40ce40c380dbe868433f5c4b20bb1ba3 (patch) | |
tree | 0bd58aa5433f8d4c207c058c259ec18fcba3e0f2 /sound/oss/dmasound/dmasound_atari.c | |
parent | ASoC: Intel: tgl_max98373: fix a runtime pm issue in multi-thread case (diff) | |
parent | Linux 5.9-rc2 (diff) | |
download | linux-1959ba4e40ce40c380dbe868433f5c4b20bb1ba3.tar.xz linux-1959ba4e40ce40c380dbe868433f5c4b20bb1ba3.zip |
Merge tag 'v5.9-rc2' into asoc-5.9
Linux 5.9-rc2
Diffstat (limited to 'sound/oss/dmasound/dmasound_atari.c')
-rw-r--r-- | sound/oss/dmasound/dmasound_atari.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c index 823ccfa089b2..81c6a9830727 100644 --- a/sound/oss/dmasound/dmasound_atari.c +++ b/sound/oss/dmasound/dmasound_atari.c @@ -1449,7 +1449,7 @@ static int FalconMixerIoctl(u_int cmd, u_long arg) tt_dmasnd.input_gain = RECLEVEL_VOXWARE_TO_GAIN(data & 0xff) << 4 | RECLEVEL_VOXWARE_TO_GAIN(data >> 8 & 0xff); - /* fall through - return set value */ + fallthrough; /* return set value */ case SOUND_MIXER_READ_MIC: return IOCTL_OUT(arg, RECLEVEL_GAIN_TO_VOXWARE(tt_dmasnd.input_gain >> 4 & 0xf) | |