diff options
author | Mark Brown <broonie@kernel.org> | 2018-08-09 14:47:05 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-08-09 14:47:05 +0100 |
commit | 4aa5db22d35588e1a5d2ee88472348ea73d9fb23 (patch) | |
tree | 67c98488983a71305e24940930d6e27a96d54db2 /sound/soc/fsl/fsl-asoc-card.c | |
parent | Merge branch 'asoc-4.18' into asoc-linus (diff) | |
parent | ASoC: adav80x: mark expected switch fall-through (diff) | |
download | linux-dev-4aa5db22d35588e1a5d2ee88472348ea73d9fb23.tar.xz linux-dev-4aa5db22d35588e1a5d2ee88472348ea73d9fb23.zip |
Merge branch 'asoc-4.19' into asoc-next
Diffstat (limited to 'sound/soc/fsl/fsl-asoc-card.c')
-rw-r--r-- | sound/soc/fsl/fsl-asoc-card.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 4a6750aa3637..44433b20435c 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -1,14 +1,10 @@ -/* - * Freescale Generic ASoC Sound Card driver with ASRC - * - * Copyright (C) 2014 Freescale Semiconductor, Inc. - * - * Author: Nicolin Chen <nicoleotsuka@gmail.com> - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - */ +// SPDX-License-Identifier: GPL-2.0 +// +// Freescale Generic ASoC Sound Card driver with ASRC +// +// Copyright (C) 2014 Freescale Semiconductor, Inc. +// +// Author: Nicolin Chen <nicoleotsuka@gmail.com> #include <linux/clk.h> #include <linux/i2c.h> @@ -199,7 +195,7 @@ static int be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, mask = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT); snd_mask_none(mask); - snd_mask_set(mask, (__force int)priv->asrc_format); + snd_mask_set_format(mask, priv->asrc_format); return 0; } |