openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Conflicts:
	sound/soc/fsl/fsl_ssi.c
This commit is contained in:
Mark Brown 2015-01-08 19:54:56 +00:00
parent b968d83f09 64aa5f5843
commit 4536a00116
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/fsl/fsl_ssi.c
View File

@ -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? */