summaryrefslogtreecommitdiffstats
path: root/sound/soc/fsl/imx-ssi.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-14 22:29:31 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-08-14 22:29:31 +0200
commitd985524680b77a1cf90738db9a2d72065a746afa (patch)
tree101857c3e59f9238b0c7d4bbbf58e46476957387 /sound/soc/fsl/imx-ssi.c
parentMAINTAINERS: fpga: Update email and add patchwork URL (diff)
parentLinux 4.13-rc5 (diff)
downloadlinux-d985524680b77a1cf90738db9a2d72065a746afa.tar.xz
linux-d985524680b77a1cf90738db9a2d72065a746afa.zip
Merge 4.13-rc5 into char-misc-next
We want the firmware, and other changes, in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/soc/fsl/imx-ssi.c')
-rw-r--r--sound/soc/fsl/imx-ssi.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c
index b95132e2f9dc..06790615e04e 100644
--- a/sound/soc/fsl/imx-ssi.c
+++ b/sound/soc/fsl/imx-ssi.c
@@ -527,6 +527,10 @@ static int imx_ssi_probe(struct platform_device *pdev)
}
ssi->irq = platform_get_irq(pdev, 0);
+ if (ssi->irq < 0) {
+ dev_err(&pdev->dev, "Failed to get IRQ: %d\n", ssi->irq);
+ return ssi->irq;
+ }
ssi->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(ssi->clk)) {