Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl

Conflicts:
	sound/soc/fsl/fsl_ssi.c

diff --cc sound/soc/fsl/fsl_ssi.c
index fa19507ca4e6138393d3b5bf3b952380d20483b7,059496ed9ad76c4771ccafbe593a1e0c971f9420..65400bef013ceece0614681c52ab67d3d944a1d0
--- 1/sound/soc/fsl/fsl_ssi.c
--- 2/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@@ -1362,9 -1362,9 +1362,9 @@@ static int fsl_ssi_probe(struct platfor
        }
  
        ssi_private->irq = platform_get_irq(pdev, 0);
 -      if (ssi_private->irq < 0) {
 -              dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
 +      if (!ssi_private->irq) {
 +              dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
-               return -ENXIO;
+               return ssi_private->irq;
        }
  
        /* Are the RX and the TX clocks locked? */