Merge branch 'topic/core' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-dma

4 files changed, 17 insertions, 20 deletions

diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 45b72561c615..350b86458971 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -324,7 +324,7 @@ config SND_SOC_TLV320AIC23
         tristate
 
 config SND_SOC_TLV320AIC26
-        tristate "TI TLV320AIC26 Codec support" if SND_SOC_OF_SIMPLE
+        tristate
         depends on SPI
 
 config SND_SOC_TLV320AIC32X4
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b7e84a7cd9ee..4d24b5ea3ba7 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3906,7 +3906,7 @@ EXPORT_SYMBOL_GPL(snd_soc_unregister_dais);
  * @platform: platform to register
  */
 int snd_soc_register_platform(struct device *dev,
-                struct snd_soc_platform_driver *platform_drv)
+                const struct snd_soc_platform_driver *platform_drv)
 {
         struct snd_soc_platform *platform;
 
@@ -4022,8 +4022,8 @@ int snd_soc_register_codec(struct device *dev,
         /* create CODEC component name */
         codec->name = fmt_single_name(dev, &codec->id);
         if (codec->name == NULL) {
-                kfree(codec);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto fail_codec;
         }
 
         if (codec_drv->compress_type)
@@ -4062,7 +4062,7 @@ int snd_soc_register_codec(struct device *dev,
                                                       reg_size, GFP_KERNEL);
                         if (!codec->reg_def_copy) {
                                 ret = -ENOMEM;
-                                goto fail;
+                                goto fail_codec_name;
                         }
                 }
         }
@@ -4086,18 +4086,22 @@ int snd_soc_register_codec(struct device *dev,
         mutex_unlock(&client_mutex);
 
         /* register any DAIs */
-        if (num_dai) {
-                ret = snd_soc_register_dais(dev, dai_drv, num_dai);
-                if (ret < 0)
-                        dev_err(codec->dev, "ASoC: Failed to regster"
-                                " DAIs: %d\n", ret);
+        ret = snd_soc_register_dais(dev, dai_drv, num_dai);
+        if (ret < 0) {
+                dev_err(codec->dev, "ASoC: Failed to regster DAIs: %d\n", ret);
+                goto fail_codec_name;
         }
 
         dev_dbg(codec->dev, "ASoC: Registered codec '%s'\n", codec->name);
         return 0;
 
-fail:
+fail_codec_name:
+        mutex_lock(&client_mutex);
+        list_del(&codec->list);
+        mutex_unlock(&client_mutex);
+
         kfree(codec->name);
+fail_codec:
         kfree(codec);
         return ret;
 }
@@ -4111,7 +4115,6 @@ EXPORT_SYMBOL_GPL(snd_soc_register_codec);
 void snd_soc_unregister_codec(struct device *dev)
 {
         struct snd_soc_codec *codec;
-        int i;
 
         list_for_each_entry(codec, &codec_list, list) {
                 if (dev == codec->dev)
@@ -4120,9 +4123,7 @@ void snd_soc_unregister_codec(struct device *dev)
         return;
 
 found:
-        if (codec->num_dai)
-                for (i = 0; i < codec->num_dai; i++)
-                        snd_soc_unregister_dai(dev);
+        snd_soc_unregister_dais(dev, codec->num_dai);
 
         mutex_lock(&client_mutex);
         list_del(&codec->list);
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c
index 1d6a9b3ceb27..625d4824abbb 100644
--- a/sound/soc/soc-dapm.c
+++ b/sound/soc/soc-dapm.c
@@ -3123,7 +3123,6 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm,
                 break;
         }
 
-        dapm->n_widgets++;
         w->dapm = dapm;
         w->codec = dapm->codec;
         w->platform = dapm->platform;
diff --git a/sound/soc/soc-io.c b/sound/soc/soc-io.c
index 29183ef2b93d..8ca9ecc5ac57 100644
--- a/sound/soc/soc-io.c
+++ b/sound/soc/soc-io.c
@@ -158,10 +158,7 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
                 return -EINVAL;
         }
 
-        if (IS_ERR(codec->control_data))
-                return PTR_ERR(codec->control_data);
-
-        return 0;
+        return PTR_RET(codec->control_data);
 }
 EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io);
 #else