diff options
| -rw-r--r-- | sound/soc/codecs/wcd938x.c | 8 | ||||
| -rw-r--r-- | sound/soc/fsl/fsl-asoc-card.c | 2 | ||||
| -rw-r--r-- | sound/soc/generic/simple-card.c | 1 | ||||
| -rw-r--r-- | sound/soc/sof/imx/imx8.c | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/sound/soc/codecs/wcd938x.c b/sound/soc/codecs/wcd938x.c index cb22fdf812f4..78b76eceff8f 100644 --- a/sound/soc/codecs/wcd938x.c +++ b/sound/soc/codecs/wcd938x.c @@ -2085,11 +2085,9 @@ static int wcd938x_tx_swr_ctrl(struct snd_soc_dapm_widget *w, } rate = wcd938x_get_clk_rate(i); wcd938x_set_swr_clk_rate(component, rate, bank); - } - - if (strnstr(w->name, "ADC", sizeof("ADC"))) /* Copy clk settings to active bank */ wcd938x_set_swr_clk_rate(component, rate, !bank); + } break; case SND_SOC_DAPM_POST_PMD: if (strnstr(w->name, "ADC", sizeof("ADC"))) { @@ -2184,6 +2182,8 @@ static void wcd938x_tx_channel_config(struct snd_soc_component *component, reg = WCD938X_ANA_TX_CH4; mask = WCD938X_HPF4_INIT_MASK; break; + default: + return; } snd_soc_component_write_field(component, reg, mask, mode); @@ -3713,12 +3713,14 @@ static int wcd938x_remove(struct platform_device *pdev) return 0; } +#if defined(CONFIG_OF) static const struct of_device_id wcd938x_dt_match[] = { { .compatible = "qcom,wcd9380-codec" }, { .compatible = "qcom,wcd9385-codec" }, {} }; MODULE_DEVICE_TABLE(of, wcd938x_dt_match); +#endif static struct platform_driver wcd938x_codec_driver = { .probe = wcd938x_probe, diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index 14d2956d0da3..6f40b5ff9009 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -708,7 +708,7 @@ static int fsl_asoc_card_probe(struct platform_device *pdev) of_node_put(framemaster); if (!fsl_asoc_card_is_ac97(priv) && !codec_dev) { - dev_err(&pdev->dev, "failed to find codec device\n"); + dev_dbg(&pdev->dev, "failed to find codec device\n"); ret = -EPROBE_DEFER; goto asrc_fail; } diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 0015f534d42d..a3a7990b5cb6 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -621,6 +621,7 @@ static int asoc_simple_probe(struct platform_device *pdev) card->owner = THIS_MODULE; card->dev = dev; card->probe = simple_soc_probe; + card->driver_name = "simple-card"; li = devm_kzalloc(dev, sizeof(*li), GFP_KERNEL); if (!li) diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c index 4e7dccadd7d0..12fedf0984bd 100644 --- a/sound/soc/sof/imx/imx8.c +++ b/sound/soc/sof/imx/imx8.c @@ -315,6 +315,7 @@ static int imx8_probe(struct snd_sof_dev *sdev) } ret = of_address_to_resource(res_node, 0, &res); + of_node_put(res_node); if (ret) { dev_err(&pdev->dev, "failed to get reserved region address\n"); goto exit_pdev_unregister; |