Commit 4536a001 authored by Mark Brown's avatar Mark Brown

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

Conflicts:
	sound/soc/fsl/fsl_ssi.c
parents b968d83f 64aa5f58
...@@ -1364,7 +1364,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) ...@@ -1364,7 +1364,7 @@ static int fsl_ssi_probe(struct platform_device *pdev)
ssi_private->irq = platform_get_irq(pdev, 0); ssi_private->irq = platform_get_irq(pdev, 0);
if (!ssi_private->irq) { if (!ssi_private->irq) {
dev_err(&pdev->dev, "no irq for node %s\n", pdev->name); 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? */ /* Are the RX and the TX clocks locked? */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment