The DAI link array is hard-coded as a single CPU / CODEC link.
This patch allocates this array with the card definition and facilitates
handling more DAI links.
Signed-off-by: Jean-Francois Moine <moin...@free.fr>
---
sound/soc/generic/simple-card.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index dcf37fb..2710b52 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -23,7 +23,7 @@ struct simple_card_data {
unsigned int daifmt;
struct asoc_simple_dai cpu_dai;
struct asoc_simple_dai codec_dai;
- struct snd_soc_dai_link snd_link;
+ struct snd_soc_dai_link dai_link[]; /* dynamically allocated */
};
static int __asoc_simple_card_dai_init(struct snd_soc_dai *dai,
@@ -276,7 +276,9 @@ static int asoc_simple_card_probe(struct platform_device
*pdev)
struct device *dev = &pdev->dev;
int ret;
- priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+ priv = devm_kzalloc(dev,
+ sizeof(*priv) + sizeof(*dai_link),
+ GFP_KERNEL);
if (!priv)
return -ENOMEM;
@@ -285,7 +287,7 @@ static int asoc_simple_card_probe(struct platform_device
*pdev)
*/
priv->snd_card.owner = THIS_MODULE;
priv->snd_card.dev = dev;
- dai_link = &priv->snd_link;
+ dai_link = priv->dai_link;
priv->snd_card.dai_link = dai_link;
priv->snd_card.num_links = 1;
--
1.9.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
