diff options
| author | Mark Brown <broonie@kernel.org> | 2019-04-26 13:02:03 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-04-26 13:02:03 +0300 |
| commit | 93f38ef6a4b62fd57076d36d1345d69f8a328ad9 (patch) | |
| tree | bc7f20d968c8d1f7374927bd187d3f26f786459d /sound/soc/stm | |
| parent | 552f2d7edd38e29073f8036191320f09b534c480 (diff) | |
| parent | 780f202f2bf48aaa09282efc4dd6c39a146cc1f3 (diff) | |
| download | linux-93f38ef6a4b62fd57076d36d1345d69f8a328ad9.tar.xz | |
Merge branch 'asoc-5.1' into asoc-5.2
Diffstat (limited to 'sound/soc/stm')
| -rw-r--r-- | sound/soc/stm/stm32_i2s.c | 5 | ||||
| -rw-r--r-- | sound/soc/stm/stm32_sai_sub.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c index 952634258b02..97d5e9901a0e 100644 --- a/sound/soc/stm/stm32_i2s.c +++ b/sound/soc/stm/stm32_i2s.c @@ -838,8 +838,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, diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c index 2a90641cf164..3dd54bc54fa1 100644 --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -1420,7 +1420,6 @@ static int stm32_sai_sub_dais_init(struct platform_device *pdev, if (!sai->cpu_dai_drv) return -ENOMEM; - sai->cpu_dai_drv->name = dev_name(&pdev->dev); if (STM_SAI_IS_PLAYBACK(sai)) { memcpy(sai->cpu_dai_drv, &stm32_sai_playback_dai, sizeof(stm32_sai_playback_dai)); @@ -1430,6 +1429,7 @@ static int stm32_sai_sub_dais_init(struct platform_device *pdev, sizeof(stm32_sai_capture_dai)); sai->cpu_dai_drv->capture.stream_name = sai->cpu_dai_drv->name; } + sai->cpu_dai_drv->name = dev_name(&pdev->dev); return 0; } |