diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-23 15:00:58 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-23 15:00:58 +0100 |
| commit | ca9e54c625911cb9c409687d96e78645cf55fa33 (patch) | |
| tree | 7ddb1d9df392fd466d3175beb1715a0bf01bd0f8 /sound/soc/sh/rcar/gen.c | |
| parent | Merge remote-tracking branches 'asoc/topic/max98090' and 'asoc/topic/omap' in... (diff) | |
| parent | ASoC: rsnd: add DeviceTree support (diff) | |
| download | linux-ca9e54c625911cb9c409687d96e78645cf55fa33.tar.xz linux-ca9e54c625911cb9c409687d96e78645cf55fa33.zip | |
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Diffstat (limited to 'sound/soc/sh/rcar/gen.c')
| -rw-r--r-- | sound/soc/sh/rcar/gen.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/sound/soc/sh/rcar/gen.c b/sound/soc/sh/rcar/gen.c index 9094970dbdfb..50a1ef3eb1c6 100644 --- a/sound/soc/sh/rcar/gen.c +++ b/sound/soc/sh/rcar/gen.c @@ -359,13 +359,28 @@ static int rsnd_gen1_probe(struct platform_device *pdev, /* * Gen */ +static void rsnd_of_parse_gen(struct platform_device *pdev, + const struct rsnd_of_data *of_data, + struct rsnd_priv *priv) +{ + struct rcar_snd_info *info = priv->info; + + if (!of_data) + return; + + info->flags = of_data->flags; +} + int rsnd_gen_probe(struct platform_device *pdev, + const struct rsnd_of_data *of_data, struct rsnd_priv *priv) { struct device *dev = rsnd_priv_to_dev(priv); struct rsnd_gen *gen; int ret; + rsnd_of_parse_gen(pdev, of_data, priv); + gen = devm_kzalloc(dev, sizeof(*gen), GFP_KERNEL); if (!gen) { dev_err(dev, "GEN allocate failed\n"); |