kernel: bump 5.4 to 5.4.71
[openwrt/openwrt.git] / target / linux / layerscape / patches-5.4 / 801-audio-0060-ASoC-fsl_sai-Support-EPROBE_DEFER.patch
1 From 906ed2027fe62acf79be975c06fc297e77331191 Mon Sep 17 00:00:00 2001
2 From: Shengjiu Wang <shengjiu.wang@nxp.com>
3 Date: Tue, 29 Jan 2019 14:41:39 +0800
4 Subject: [PATCH] ASoC: fsl_sai: Support -EPROBE_DEFER
5
6 Support -EPROBE_DEFER for the resource is not ready in time
7
8 Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
9 ---
10 sound/soc/fsl/fsl_sai.c | 2 +-
11 1 file changed, 1 insertion(+), 1 deletion(-)
12
13 --- a/sound/soc/fsl/fsl_sai.c
14 +++ b/sound/soc/fsl/fsl_sai.c
15 @@ -1383,7 +1383,7 @@ static int fsl_sai_probe(struct platform
16 "bus", base, &fsl_sai_regmap_config);
17
18 /* Compatible with old DTB cases */
19 - if (IS_ERR(sai->regmap))
20 + if (IS_ERR(sai->regmap) && PTR_ERR(sai->regmap) != -EPROBE_DEFER)
21 sai->regmap = devm_regmap_init_mmio_clk(&pdev->dev,
22 "sai", base, &fsl_sai_regmap_config);
23 if (IS_ERR(sai->regmap)) {