diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-08 14:54:56 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-08 14:54:56 -0500 |
| commit | 4536a00116f084cf20ec77f3540c481c02ad8d0e (patch) | |
| tree | b88e70fe27ed37a34da32db041e2e06aacb85fdb /sound/soc/fsl | |
| parent | b968d83f09d8a4af1c178f504bc0414bbb37651d (diff) | |
| parent | 64aa5f5843ab12455f6984928058a267f385a82c (diff) | |
Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl
Conflicts:
sound/soc/fsl/fsl_ssi.c
Diffstat (limited to 'sound/soc/fsl')
| -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) | |||
| 1364 | ssi_private->irq = platform_get_irq(pdev, 0); | 1364 | ssi_private->irq = platform_get_irq(pdev, 0); |
| 1365 | if (!ssi_private->irq) { | 1365 | if (!ssi_private->irq) { |
| 1366 | dev_err(&pdev->dev, "no irq for node %s\n", pdev->name); | 1366 | dev_err(&pdev->dev, "no irq for node %s\n", pdev->name); |
| 1367 | return -ENXIO; | 1367 | return ssi_private->irq; |
| 1368 | } | 1368 | } |
| 1369 | 1369 | ||
| 1370 | /* Are the RX and the TX clocks locked? */ | 1370 | /* Are the RX and the TX clocks locked? */ |