From: Kuninori Morimoto Date: Mon, 3 Mar 2014 04:32:43 +0000 (-0800) Subject: ASoC: simple-card: tidyup cpu/codec dai_fmt settings for non-DT X-Git-Tag: accepted/tizen/common/20141203.182822~239^2~19^2~1^2~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=81985bd63f6f1711035aa8d97caf2fb203250a95;p=platform%2Fkernel%2Flinux-arm64.git ASoC: simple-card: tidyup cpu/codec dai_fmt settings for non-DT 30d0341e7da0c012f64fb290dd1153360fb49a8d (ASoC: simple-card: simplify the daifmt code) simplify cpu/codec dai_fmt which consists from dai specific format + common format. But, it didn't care about non-DT case. This patch fixes it Signed-off-by: Kuninori Morimoto Signed-off-by: Mark Brown --- diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 034a2b7..7cabcc5 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -307,6 +307,9 @@ static int asoc_simple_card_probe(struct platform_device *pdev) sizeof(priv->cpu_dai)); memcpy(&priv->codec_dai, &cinfo->codec_dai, sizeof(priv->codec_dai)); + + priv->cpu_dai.fmt |= cinfo->daifmt; + priv->codec_dai.fmt |= cinfo->daifmt; } /*