Skip to content

Commit

Permalink
ASoC: simple-card: card name can be option
Browse files Browse the repository at this point in the history
snd_card.name is now option on DT case.
non-DT case can follow same style,
and it is understandable from platform point of view.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
morimoto authored and broonie committed Mar 10, 2014
1 parent 81985bd commit 12ffa6f
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions sound/soc/generic/simple-card.c
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
}

if (!cinfo->name ||
!cinfo->card ||
!cinfo->codec_dai.name ||
!cinfo->codec ||
!cinfo->platform ||
Expand All @@ -296,7 +295,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
return -EINVAL;
}

priv->snd_card.name = cinfo->card;
priv->snd_card.name = (cinfo->card) ? cinfo->card : cinfo->name;
dai_link->name = cinfo->name;
dai_link->stream_name = cinfo->name;
dai_link->platform_name = cinfo->platform;
Expand Down

0 comments on commit 12ffa6f

Please sign in to comment.