summaryrefslogtreecommitdiff
path: root/sound/soc/stm
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-05-06 16:51:52 +0300
committerMark Brown <broonie@kernel.org>2019-05-06 16:51:52 +0300
commit7f5a466f2ea1115a4a73d987b7b6a73d23475305 (patch)
treef7e9399912fae24b6364f7e8b2e327623324f516 /sound/soc/stm
parente93c9c99a629c61837d5a7fc2120cd2b6c70dbdd (diff)
parentf47b9ad927c6370b80922af434dda98764a43804 (diff)
downloadlinux-7f5a466f2ea1115a4a73d987b7b6a73d23475305.tar.xz
Merge branch 'asoc-5.1' into asoc-linus
Diffstat (limited to 'sound/soc/stm')
-rw-r--r--sound/soc/stm/stm32_i2s.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c
index 8968458eec62..e707d28cb203 100644
--- a/sound/soc/stm/stm32_i2s.c
+++ b/sound/soc/stm/stm32_i2s.c
@@ -845,8 +845,9 @@ static int stm32_i2s_parse_dt(struct platform_device *pdev,
/* Get irqs */
irq = platform_get_irq(pdev, 0);
if (irq < 0) {
- dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
- return -ENOENT;
+ if (irq != -EPROBE_DEFER)
+ dev_err(&pdev->dev, "no irq for node %s\n", pdev->name);
+ return irq;
}
ret = devm_request_irq(&pdev->dev, irq, stm32_i2s_isr, IRQF_ONESHOT,