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

Conflicts:
	sound/soc/fsl/fsl_ssi.c

sound/soc/fsl/fsl_ssi.c

@@ -1364,7 +1364,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
 	ssi_private->irq = platform_get_irq(pdev, 0);
 	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? */