Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next

2 files changed, 12 insertions, 7 deletions

diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c
index 9a4a0ca2c1de..5983740be123 100644
--- a/sound/soc/fsl/eukrea-tlv320.c
+++ b/sound/soc/fsl/eukrea-tlv320.c
@@ -42,7 +42,8 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream,
                                   SND_SOC_DAIFMT_NB_NF |
                                   SND_SOC_DAIFMT_CBM_CFM);
         if (ret) {
-                pr_err("%s: failed set cpu dai format\n", __func__);
+                dev_err(cpu_dai->dev,
+                        "Failed to set the cpu dai format.\n");
                 return ret;
         }
 
@@ -50,14 +51,16 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream,
                                   SND_SOC_DAIFMT_NB_NF |
                                   SND_SOC_DAIFMT_CBM_CFM);
         if (ret) {
-                pr_err("%s: failed set codec dai format\n", __func__);
+                dev_err(cpu_dai->dev,
+                        "Failed to set the codec format.\n");
                 return ret;
         }
 
         ret = snd_soc_dai_set_sysclk(codec_dai, 0,
                                      CODEC_CLOCK, SND_SOC_CLOCK_OUT);
         if (ret) {
-                pr_err("%s: failed setting codec sysclk\n", __func__);
+                dev_err(cpu_dai->dev,
+                        "Failed to set the codec sysclk.\n");
                 return ret;
         }
         snd_soc_dai_set_tdm_slot(cpu_dai, 0xffffffc, 0xffffffc, 2, 0);
@@ -65,7 +68,8 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream,
         ret = snd_soc_dai_set_sysclk(cpu_dai, IMX_SSP_SYS_CLK, 0,
                                 SND_SOC_CLOCK_IN);
         if (ret) {
-                pr_err("can't set CPU system clock IMX_SSP_SYS_CLK\n");
+                dev_err(cpu_dai->dev,
+                        "Can't set the IMX_SSP_SYS_CLK CPU system clock.\n");
                 return ret;
         }
 
@@ -155,7 +159,8 @@ static struct platform_driver eukrea_tlv320_driver = {
                 .owner = THIS_MODULE,
         },
         .probe = eukrea_tlv320_probe,
-        .remove = eukrea_tlv320_remove,};
+        .remove = eukrea_tlv320_remove,
+};
 
 module_platform_driver(eukrea_tlv320_driver);
 
diff --git a/sound/soc/fsl/fsl_spdif.c b/sound/soc/fsl/fsl_spdif.c
index ff1f34766ee3..76c742a09ef9 100644
--- a/sound/soc/fsl/fsl_spdif.c
+++ b/sound/soc/fsl/fsl_spdif.c
@@ -1107,9 +1107,9 @@ static int fsl_spdif_probe(struct platform_device *pdev)
 
         /* Get the addresses and IRQ */
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        if (IS_ERR(res)) {
+        if (!res) {
                 dev_err(&pdev->dev, "could not determine device resources\n");
-                return PTR_ERR(res);
+                return -ENXIO;
         }
 
         regs = devm_ioremap_resource(&pdev->dev, res);