diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-08 20:54:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-08 20:54:56 +0100 |
| commit | 4536a00116f084cf20ec77f3540c481c02ad8d0e (patch) | |
| tree | b88e70fe27ed37a34da32db041e2e06aacb85fdb /sound | |
| parent | ASoC: fsl_spdif: Make error message concise (diff) | |
| parent | ASoC: fsl_ssi: Fix irq error check (diff) | |
| download | linux-4536a00116f084cf20ec77f3540c481c02ad8d0e.tar.xz linux-4536a00116f084cf20ec77f3540c481c02ad8d0e.zip | |
Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl
Conflicts:
sound/soc/fsl/fsl_ssi.c
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 2 |
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? */ |