From: Mark Brown <broonie@kernel.org>
Date: Thu, 8 Jan 2015 19:54:56 +0000 (+0000)
Subject: Merge remote-tracking branch 'asoc/fix/fsl-ssi' into asoc-fsl
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4536a00116f084cf20ec77f3540c481c02ad8d0e;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

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

Conflicts:
	sound/soc/fsl/fsl_ssi.c
---

4536a00116f084cf20ec77f3540c481c02ad8d0e
diff --cc sound/soc/fsl/fsl_ssi.c
index fa19507ca4e6,059496ed9ad7..65400bef013c
--- a/sound/soc/fsl/fsl_ssi.c
+++ b/sound/soc/fsl/fsl_ssi.c
@@@ -1362,9 -1362,9 +1362,9 @@@ static int fsl_ssi_probe(struct platfor
  	}
  
  	ssi_private->irq = platform_get_irq(pdev, 0);
 -	if (ssi_private->irq < 0) {
 -		dev_err(&pdev->dev, "no irq for node %s\n", np->full_name);
 +	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? */