2020-04-10 02:47:05 +00:00
|
|
|
From 0524e0b15966f8cbb010d430ec3fdcf9faf876f4 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Yangbo Lu <yangbo.lu@nxp.com>
|
|
|
|
|
Date: Wed, 1 Apr 2020 15:49:50 +0800
|
|
|
|
|
Subject: [PATCH] ASoC: fsl_sai: fix build issue of incomplete parentheses
|
|
|
|
|
|
|
|
|
|
Fix build issue of incomplete parentheses.
|
|
|
|
|
|
|
|
|
|
Fixes: c516c26 (MLK-13574-2: ASoC: fsl_sai: refine driver for ip upgrade)
|
|
|
|
|
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
|
|
|
|
|
---
|
|
|
|
|
sound/soc/fsl/fsl_sai.c | 2 +-
|
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/sound/soc/fsl/fsl_sai.c
|
|
|
|
|
+++ b/sound/soc/fsl/fsl_sai.c
|
kernel: bump 5.4 to 5.4.73
Removed upstreamed patches:
generic/pending-5.4
445-mtd-spinand-gigadevice-Only-one-dummy-byte-in-QUA.patch
446-mtd-spinand-gigadevice-Add-QE-Bit.patch
pistachio/patches-5.4
150-pwm-img-Fix-null-pointer-access-in-probe.patch
Manually rebased:
layerscape/patches-5.4
801-audio-0011-Revert-ASoC-fsl_sai-add-of_match-data.patch
801-audio-0039-MLK-16224-6-ASoC-fsl_sai-fix-DSD-suspend-resume.patch
801-audio-0073-MLK-21957-3-ASoC-fsl_sai-add-bitcount-and-timestamp-.patch
820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch
All modifications made by update_kernel.sh
Build system: x86_64
Build-tested: ipq806x/R7800, ath79/generic, bcm27xx/bcm2711,
mvebu (mamba, rango), x86_64, ramips/mt7621
Run-tested: ipq806x/R7800, mvebu (mamba, rango), x86_64, ramips (RT-AC57U)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
[alter 820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-10-31 11:35:12 +00:00
|
|
|
@@ -1634,7 +1634,7 @@ static int fsl_sai_probe(struct platform
|
2020-04-10 02:47:05 +00:00
|
|
|
if (ret)
|
|
|
|
|
goto err_pm_disable;
|
|
|
|
|
|
|
|
|
|
- if (sai->soc->imx)
|
|
|
|
|
+ if (sai->soc->imx) {
|
|
|
|
|
ret = imx_pcm_dma_init(pdev, IMX_SAI_DMABUF_SIZE);
|
|
|
|
|
if (ret)
|
|
|
|
|
goto err_pm_disable;
|
