Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / fsl / fsl-asoc-card.c

diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c
index d9a0d4768c4d5627358a987544d405aae7940434..c836848ef0a65ecce8e6bf970fa48f6bcf91d33c 100644 (file)
--- a/sound/soc/fsl/fsl-asoc-card.c
+++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -537,6 +537,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
        struct device *codec_dev = NULL;
        const char *codec_dai_name;
        const char *codec_dev_name;
+       u32 asrc_fmt = 0;
        u32 width;
        int ret;
 
@@ -829,8 +830,8 @@ static int fsl_asoc_card_probe(struct platform_device *pdev)
                        goto asrc_fail;
                }
 
-               ret = of_property_read_u32(asrc_np, "fsl,asrc-format",
-                                          &priv->asrc_format);
+               ret = of_property_read_u32(asrc_np, "fsl,asrc-format", &asrc_fmt);
+               priv->asrc_format = (__force snd_pcm_format_t)asrc_fmt;
                if (ret) {
                        /* Fallback to old binding; translate to asrc_format */
                        ret = of_property_read_u32(asrc_np, "fsl,asrc-width",