Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Conflicts:
	sound/soc/fsl/fsl_ssi.c
parents b968d83f 64aa5f58

sound/soc/fsl/fsl_ssi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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? */