summaryrefslogtreecommitdiff
path: root/sound/soc/soc-core.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/soc-core.c')
-rw-r--r--sound/soc/soc-core.c47
1 files changed, 26 insertions, 21 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index e824ff1a9fc0..12a82f5a3ff6 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -72,7 +72,7 @@ static ssize_t pmdown_time_show(struct device *dev,
{
struct snd_soc_pcm_runtime *rtd = dev_get_drvdata(dev);
- return sprintf(buf, "%ld\n", rtd->pmdown_time);
+ return sysfs_emit(buf, "%ld\n", rtd->pmdown_time);
}
static ssize_t pmdown_time_store(struct device *dev,
@@ -107,7 +107,7 @@ static umode_t soc_dev_attr_is_visible(struct kobject *kobj,
if (attr == &dev_attr_pmdown_time.attr)
return attr->mode; /* always visible */
- return rtd->num_codecs ? attr->mode : 0; /* enabled only with codec */
+ return rtd->dai_link->num_codecs ? attr->mode : 0; /* enabled only with codec */
}
static const struct attribute_group soc_dapm_dev_group = {
@@ -482,11 +482,10 @@ static struct snd_soc_pcm_runtime *soc_new_pcm_runtime(
* asoc_rtd_to_cpu()
* asoc_rtd_to_codec()
*/
- rtd->num_cpus = dai_link->num_cpus;
- rtd->num_codecs = dai_link->num_codecs;
rtd->card = card;
rtd->dai_link = dai_link;
rtd->num = card->num_rtd++;
+ rtd->pmdown_time = pmdown_time; /* default power off timeout */
/* see for_each_card_rtds */
list_add_tail(&rtd->list, &card->rtd_list);
@@ -1247,9 +1246,6 @@ static int soc_init_pcm_runtime(struct snd_soc_card *card,
struct snd_soc_component *component;
int ret, num, i;
- /* set default power off timeout */
- rtd->pmdown_time = pmdown_time;
-
/* do machine specific initialization */
ret = snd_soc_link_init(rtd);
if (ret < 0)
@@ -1840,21 +1836,22 @@ match:
}
}
-#define soc_setup_card_name(name, name1, name2, norm) \
- __soc_setup_card_name(name, sizeof(name), name1, name2, norm)
-static void __soc_setup_card_name(char *name, int len,
- const char *name1, const char *name2,
- int normalization)
+#define soc_setup_card_name(card, name, name1, name2) \
+ __soc_setup_card_name(card, name, sizeof(name), name1, name2)
+static void __soc_setup_card_name(struct snd_soc_card *card,
+ char *name, int len,
+ const char *name1, const char *name2)
{
+ const char *src = name1 ? name1 : name2;
int i;
- snprintf(name, len, "%s", name1 ? name1 : name2);
+ snprintf(name, len, "%s", src);
- if (!normalization)
+ if (name != card->snd_card->driver)
return;
/*
- * Name normalization
+ * Name normalization (driver field)
*
* The driver name is somewhat special, as it's used as a key for
* searches in the user-space.
@@ -1874,6 +1871,14 @@ static void __soc_setup_card_name(char *name, int len,
break;
}
}
+
+ /*
+ * The driver field should contain a valid string from the user view.
+ * The wrapping usually does not work so well here. Set a smaller string
+ * in the specific ASoC driver.
+ */
+ if (strlen(src) > len - 1)
+ dev_err(card->dev, "ASoC: driver name too long '%s' -> '%s'\n", src, name);
}
static void soc_cleanup_card_resources(struct snd_soc_card *card)
@@ -2041,12 +2046,12 @@ static int snd_soc_bind_card(struct snd_soc_card *card)
/* try to set some sane longname if DMI is available */
snd_soc_set_dmi_name(card, NULL);
- soc_setup_card_name(card->snd_card->shortname,
- card->name, NULL, 0);
- soc_setup_card_name(card->snd_card->longname,
- card->long_name, card->name, 0);
- soc_setup_card_name(card->snd_card->driver,
- card->driver_name, card->name, 1);
+ soc_setup_card_name(card, card->snd_card->shortname,
+ card->name, NULL);
+ soc_setup_card_name(card, card->snd_card->longname,
+ card->long_name, card->name);
+ soc_setup_card_name(card, card->snd_card->driver,
+ card->driver_name, card->name);
if (card->components) {
/* the current implementation of snd_component_add() accepts */