diff options
| author | Takashi Iwai <[email protected]> | 2022-01-05 15:39:24 +0100 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2022-01-05 15:39:24 +0100 |
| commit | dec36c09a5313e811d0e0ecb313b8accc8d0fefb (patch) | |
| tree | 33409b9234a4336b0130544d31017f7ec3f74356 /sound/soc/atmel/mikroe-proto.c | |
| parent | f81483aaeb59da530b286fe5d081e1705eb5c886 (diff) | |
| parent | 9f3d45318dd9e739ed62e4218839a7a824d3cced (diff) | |
Merge tag 'asoc-v5.17' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v5.17
Not much going on framework release this time, but a big update for
drivers especially the Intel and SOF ones.
- Refinements and cleanups around the delay() APIs.
- Wider use of dev_err_probe().
- Continuing cleanups and improvements to the SOF code.
- Support for pin switches in simple-card derived cards.
- Support for AMD Renoir ACP, Asahi Kasei Microdevices AKM4375, Intel
systems using NAU8825 and MAX98390, Mediatek MT8915, nVidia Tegra20
S/PDIF, Qualcomm systems using ALC5682I-VS and Texas Instruments
TLV320ADC3xxx.
Diffstat (limited to 'sound/soc/atmel/mikroe-proto.c')
| -rw-r--r-- | sound/soc/atmel/mikroe-proto.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c index f9331f7e80fe..627564c18c27 100644 --- a/sound/soc/atmel/mikroe-proto.c +++ b/sound/soc/atmel/mikroe-proto.c @@ -144,9 +144,9 @@ static int snd_proto_probe(struct platform_device *pdev) of_node_put(cpu_np); ret = snd_soc_register_card(&snd_proto); - if (ret && ret != -EPROBE_DEFER) - dev_err(&pdev->dev, - "snd_soc_register_card() failed: %d\n", ret); + if (ret) + dev_err_probe(&pdev->dev, ret, + "snd_soc_register_card() failed\n"); return ret; } |