Merge branch 'fix/rt5645' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[firefly-linux-kernel-4.4.55.git] / sound / soc / sti / sti_uniperif.c

diff --git a/sound/soc/sti/sti_uniperif.c b/sound/soc/sti/sti_uniperif.c
index 83a301f2aa66f7c87971f5e7a173eb3a0db2eb5d..39bcefe5eea0c329910f31671575c11f8385092d 100644 (file)
--- a/sound/soc/sti/sti_uniperif.c
+++ b/sound/soc/sti/sti_uniperif.c
@@ -6,6 +6,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/pinctrl/consumer.h>
 
 #include "uniperif.h"
 
@@ -174,7 +175,7 @@ static int sti_uniperiph_cpu_dai_of(struct device_node *node,
                                     UNIPERIF_FIFO_DATA_OFFSET(uni);
 
        uni->irq = platform_get_irq(priv->pdev, 0);
-       if (!uni->irq < 0) {
+       if (uni->irq < 0) {
                dev_err(dev, "Failed to get IRQ resource");
                return -ENXIO;
        }
@@ -223,9 +224,9 @@ static int sti_uniperiph_probe(struct platform_device *pdev)
 
        dev_set_drvdata(&pdev->dev, priv);
 
-       ret = snd_soc_register_component(&pdev->dev,
-                                        &sti_uniperiph_dai_component,
-                                        priv->dai, 1);
+       ret = devm_snd_soc_register_component(&pdev->dev,
+                                             &sti_uniperiph_dai_component,
+                                             priv->dai, 1);
        if (ret < 0)
                return ret;