summaryrefslogtreecommitdiff
path: root/sound/soc/fsl/fsl_ssi.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-01-08 19:54:56 +0000
committerMark Brown <broonie@kernel.org>2015-01-08 19:54:56 +0000
commit4536a00116f084cf20ec77f3540c481c02ad8d0e (patch)
treeb88e70fe27ed37a34da32db041e2e06aacb85fdb /sound/soc/fsl/fsl_ssi.c
parentb968d83f09d8a4af1c178f504bc0414bbb37651d (diff)
parent64aa5f5843ab12455f6984928058a267f385a82c (diff)
downloadkernel-4536a00116f084cf20ec77f3540c481c02ad8d0e.tar.gz
Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl
Conflicts: sound/soc/fsl/fsl_ssi.c
Diffstat (limited to 'sound/soc/fsl/fsl_ssi.c')
-rw-r--r--sound/soc/fsl/fsl_ssi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c
index fa19507ca4e6..65400bef013c 100644
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/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? */