Skip to content

Commit

Permalink
ASoC: Make rtd->codec optional
Browse files Browse the repository at this point in the history
There are some place in the ASoC core that expect rtd->codec to be non NULL
(mainly CODEC specific sysfs files). With componentization going forward
rtd->codec might be NULL in some cases. This patch prepares the core for this by
not registering CODEC specific sysfs files if rtd->codec is NULL. sysfs file
removal does not need to be conditionalized as it handles the removal of
non-existing files just fine.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Lars-Peter Clausen authored and Mark Brown committed Aug 19, 2014
1 parent f1d45cc commit 93c3ce7
Showing 1 changed file with 14 additions and 10 deletions.
24 changes: 14 additions & 10 deletions sound/soc/soc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1261,17 +1261,21 @@ static int soc_post_component_init(struct snd_soc_pcm_runtime *rtd,
}
rtd->dev_registered = 1;

/* add DAPM sysfs entries for this codec */
ret = snd_soc_dapm_sys_add(rtd->dev);
if (ret < 0)
dev_err(rtd->dev,
"ASoC: failed to add codec dapm sysfs entries: %d\n", ret);
if (rtd->codec) {
/* add DAPM sysfs entries for this codec */
ret = snd_soc_dapm_sys_add(rtd->dev);
if (ret < 0)
dev_err(rtd->dev,
"ASoC: failed to add codec dapm sysfs entries: %d\n",
ret);

/* add codec sysfs entries */
ret = device_create_file(rtd->dev, &dev_attr_codec_reg);
if (ret < 0)
dev_err(rtd->dev,
"ASoC: failed to add codec sysfs files: %d\n", ret);
/* add codec sysfs entries */
ret = device_create_file(rtd->dev, &dev_attr_codec_reg);
if (ret < 0)
dev_err(rtd->dev,
"ASoC: failed to add codec sysfs files: %d\n",
ret);
}

return 0;
}
Expand Down

0 comments on commit 93c3ce7

Please sign in to comment.