January 2021 - Alsa-devel - mailman.alsa-project.org

[PATCH v1 1/2] dt-bindings: pinctrl: pinctrl-microchip-sgpio: Fix dt_binding_check warning
by Robert Foss 26 Jan '21

26 Jan '21

Silence indentation level warning reported by dt_binding_check in order to reduce noise during routine checks. $ make dt_binding_check mt8192-mt6359-rt1015-rt5682.yaml:10:4: [warning] wrong indentation: expected 2 but found 3 (indentation) Signed-off-by: Robert Foss <robert.foss(a)linaro.org> --- .../devicetree/bindings/pinctrl/microchip,sparx5-sgpio.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/microchip,sparx5-sgpio.yaml b/Documentation/devicetree/bindings/pinctrl/microchip,sparx5-sgpio.yaml index df0c83cb1c6e..4fe35e650909 100644 --- a/Documentation/devicetree/bindings/pinctrl/microchip,sparx5-sgpio.yaml +++ b/Documentation/devicetree/bindings/pinctrl/microchip,sparx5-sgpio.yaml @@ -99,8 +99,8 @@ patternProperties: '#interrupt-cells': description: - Specifies the pin (port and bit) and flags, as defined in - defined in include/dt-bindings/interrupt-controller/irq.h + Specifies the pin (port and bit) and flags, as defined in + defined in include/dt-bindings/interrupt-controller/irq.h const: 3 ngpios: -- 2.27.0

2 3

[PATCH v8 0/1] audio jack software injection
by Hui Wang 26 Jan '21

26 Jan '21

the changes in the v8: - change "for (i = 0; i < strlen(tname); i++)" to "for (i = 0; tname[i]; i++)" - use CONFIG_SND_DEBUG to wrap some debugfs variable and struct members. the changes in the v7: - change the format of the last part in jack-injection.rst - add dependence SND_DEBUG in the Kconfig - create debugfs_mount_dir/sound and debugfs_mount_dir/sound/cardN only SND_DEBUG is enabled - change simple_write_to_buffer(buf, count, ppos, from, count) to simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, from, count) - rewrite the function parse_mask_bits() according to v6's comment the changes in the v6: - use the sizeof(buf) to replace the digits in the scnprintf - squash the document patch into the 0001-xxx.patch. the changes in the v5: - add a Kconfig to enable/disable the jack injection feature - replace all kzalloc with local char[] in the debugfs fops - replace the chars of !isalnum() to '_' for the jack folder's name - squash all .c files patches into one patch - add a document to explain jack injection, for easier review, put the document in a standalone patch. If needed, will squash this patch to the previous one. the changes in the v4: - change the sound-core to sound and change the sound_core_debugfs_root to sound_debugfs_root in the 0001-xxx.patch - change kzalloc/kfree to kvzalloc/kvfree in the debugfs fops for 0001-xxx.patch and 0003-xxx.patch - And if needed, I could squash 4 patches into 1 patch before merging. the changes in the v3 (for easy to review, divide change into 4 patches): - address the comment about the snd_jack_report() and _snd_jack_report(), the v2 design is hard to understand and is hard to review, in the v3, separate the jack_report to snd_jack_report() and snd_jack_inject_report(), hw jack events call snd_jack_report() as before, if a jack contains multi jack_kctl and the jack_kctl's sw_inject is enabled, the status and the related input-dev's events will not be reproted. The injection events call snd_jack_inject_report(). This change is squashed to 0001-xxx.patch, the rest part of 0001-xxx.patch is same as v2. - address the comment about folders'name in the 0002-xxx.patch, so far, drop the '/', ',', '=' and ' ' from the folders' name. - address the comment about adding more debugfs nodes in the 0003-xxx.patch, it adds kctl_id, mask_bits, status and type. - address the comment about save-n-restore jack's hw status in the 0004-xxx.patch, adding a hw_status_cache and save the last reported jack hw event, once the sw_inject is disabled, will restore all jack_kctl's state under the same snd_jack with hw_status_cache. [snip] the changes in the V2: - using debugfs instead of sysfs - using jack_ctrl to create a folder instead of snd_jack, since ASoC drivers could create multi jack_ctrls within a snd_jack - create a folder for each jack_ctrl instead for all jack_ctrls [ snip ] Hui Wang (1): alsa: jack: implement software jack injection via debugfs Documentation/sound/designs/index.rst | 1 + .../sound/designs/jack-injection.rst | 166 ++++++++++ include/sound/core.h | 6 + include/sound/jack.h | 1 + sound/core/Kconfig | 9 + sound/core/init.c | 16 + sound/core/jack.c | 301 +++++++++++++++++- sound/core/sound.c | 13 + 8 files changed, 509 insertions(+), 4 deletions(-) create mode 100644 Documentation/sound/designs/jack-injection.rst -- 2.25.1

2 3

[PATCH v7 0/1] audio jack software injection
by Hui Wang 26 Jan '21

26 Jan '21

the changes in the v7: - change the format of the last part in jack-injection.rst - add dependence SND_DEBUG in the Kconfig - create debugfs_mount_dir/sound and debugfs_mount_dir/sound/cardN only SND_DEBUG is enabled - change simple_write_to_buffer(buf, count, ppos, from, count) to simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, from, count) - rewrite the function parse_mask_bits() according to v6's comment the changes in the v6: - use the sizeof(buf) to replace the digits in the scnprintf - squash the document patch into the 0001-xxx.patch. the changes in the v5: - add a Kconfig to enable/disable the jack injection feature - replace all kzalloc with local char[] in the debugfs fops - replace the chars of !isalnum() to '_' for the jack folder's name - squash all .c files patches into one patch - add a document to explain jack injection, for easier review, put the document in a standalone patch. If needed, will squash this patch to the previous one. the changes in the v4: - change the sound-core to sound and change the sound_core_debugfs_root to sound_debugfs_root in the 0001-xxx.patch - change kzalloc/kfree to kvzalloc/kvfree in the debugfs fops for 0001-xxx.patch and 0003-xxx.patch - And if needed, I could squash 4 patches into 1 patch before merging. the changes in the v3 (for easy to review, divide change into 4 patches): - address the comment about the snd_jack_report() and _snd_jack_report(), the v2 design is hard to understand and is hard to review, in the v3, separate the jack_report to snd_jack_report() and snd_jack_inject_report(), hw jack events call snd_jack_report() as before, if a jack contains multi jack_kctl and the jack_kctl's sw_inject is enabled, the status and the related input-dev's events will not be reproted. The injection events call snd_jack_inject_report(). This change is squashed to 0001-xxx.patch, the rest part of 0001-xxx.patch is same as v2. - address the comment about folders'name in the 0002-xxx.patch, so far, drop the '/', ',', '=' and ' ' from the folders' name. - address the comment about adding more debugfs nodes in the 0003-xxx.patch, it adds kctl_id, mask_bits, status and type. - address the comment about save-n-restore jack's hw status in the 0004-xxx.patch, adding a hw_status_cache and save the last reported jack hw event, once the sw_inject is disabled, will restore all jack_kctl's state under the same snd_jack with hw_status_cache. [snip] the changes in the V2: - using debugfs instead of sysfs - using jack_ctrl to create a folder instead of snd_jack, since ASoC drivers could create multi jack_ctrls within a snd_jack - create a folder for each jack_ctrl instead for all jack_ctrls [ snip ] Hui Wang (1): alsa: jack: implement software jack injection via debugfs Documentation/sound/designs/index.rst | 1 + .../sound/designs/jack-injection.rst | 166 ++++++++++ include/sound/core.h | 2 + include/sound/jack.h | 1 + sound/core/Kconfig | 9 + sound/core/init.c | 16 + sound/core/jack.c | 299 +++++++++++++++++- sound/core/sound.c | 11 + 8 files changed, 501 insertions(+), 4 deletions(-) create mode 100644 Documentation/sound/designs/jack-injection.rst -- 2.25.1

2 5

[PATCH v2 0/3] isa: Make the remove callback for isa drivers return void
by Uwe Kleine-König 26 Jan '21

26 Jan '21

Hello, changes since v1 (https://lore.kernel.org/r/20210121204812.402589-1-uwe@kleine-koenig.org): - fix build failure, found by the kernel test robot (my grep missed the struct isa_driver embedded in struct radio_isa_driver). For this I introduced patch 2 and adapted patch 3 a bit. An interdiff is below. - Added Acks/Reviews by Guenter Roeck, William Breathitt Gray, Marc Kleine-Budde, Wolfram Sang and Takashi Iwai <tiwai(a)suse.de> The base-commit I specified (by hand *sigh*) in v1 was broken, must be a cut-n-paste-error, sorry for that. Takashi suggested to take this series via sound.git given that this is the most affected tree. This is fine for me. Otherwise I can also provide an immutable branch. For both variants we still need a few acks though. Best regards Uwe Uwe Kleine-König (3): watchdog: pcwd: drop always-false if from remove callback media/radio: Make radio_isa_common_remove() return void isa: Make the remove callback for isa drivers return void drivers/base/isa.c | 2 +- drivers/i2c/busses/i2c-elektor.c | 4 +--- drivers/i2c/busses/i2c-pca-isa.c | 4 +--- drivers/input/touchscreen/htcpen.c | 4 +--- drivers/media/radio/radio-isa.c | 9 ++++----- drivers/media/radio/radio-isa.h | 2 +- drivers/media/radio/radio-sf16fmr2.c | 4 +--- drivers/net/can/sja1000/tscan1.c | 4 +--- drivers/net/ethernet/3com/3c509.c | 3 +-- drivers/scsi/advansys.c | 3 +-- drivers/scsi/aha1542.c | 3 +-- drivers/scsi/fdomain_isa.c | 3 +-- drivers/scsi/g_NCR5380.c | 5 ++--- drivers/watchdog/pcwd.c | 7 +------ include/linux/isa.h | 2 +- sound/isa/ad1848/ad1848.c | 3 +-- sound/isa/adlib.c | 3 +-- sound/isa/cmi8328.c | 3 +-- sound/isa/cmi8330.c | 3 +-- sound/isa/cs423x/cs4231.c | 3 +-- sound/isa/cs423x/cs4236.c | 3 +-- sound/isa/es1688/es1688.c | 3 +-- sound/isa/es18xx.c | 5 ++--- sound/isa/galaxy/galaxy.c | 3 +-- sound/isa/gus/gusclassic.c | 3 +-- sound/isa/gus/gusextreme.c | 3 +-- sound/isa/gus/gusmax.c | 3 +-- sound/isa/gus/interwave.c | 3 +-- sound/isa/msnd/msnd_pinnacle.c | 3 +-- sound/isa/opl3sa2.c | 3 +-- sound/isa/opti9xx/miro.c | 3 +-- sound/isa/opti9xx/opti92x-ad1848.c | 5 ++--- sound/isa/sb/jazz16.c | 3 +-- sound/isa/sb/sb16.c | 3 +-- sound/isa/sb/sb8.c | 3 +-- sound/isa/sc6000.c | 3 +-- sound/isa/sscape.c | 3 +-- sound/isa/wavefront/wavefront.c | 3 +-- 38 files changed, 44 insertions(+), 88 deletions(-) Interdiff against v1: diff --git a/drivers/media/radio/radio-isa.c b/drivers/media/radio/radio-isa.c index ad2ac16ff12d..c591c0851fa2 100644 --- a/drivers/media/radio/radio-isa.c +++ b/drivers/media/radio/radio-isa.c @@ -273,8 +273,8 @@ static int radio_isa_common_probe(struct radio_isa_card *isa, return res; } -static int radio_isa_common_remove(struct radio_isa_card *isa, - unsigned region_size) +static void radio_isa_common_remove(struct radio_isa_card *isa, + unsigned region_size) { const struct radio_isa_ops *ops = isa->drv->ops; @@ -285,7 +285,6 @@ static int radio_isa_common_remove(struct radio_isa_card *isa, release_region(isa->io, region_size); v4l2_info(&isa->v4l2_dev, "Removed radio card %s\n", isa->drv->card); kfree(isa); - return 0; } int radio_isa_probe(struct device *pdev, unsigned int dev) @@ -338,11 +337,11 @@ int radio_isa_probe(struct device *pdev, unsigned int dev) } EXPORT_SYMBOL_GPL(radio_isa_probe); -int radio_isa_remove(struct device *pdev, unsigned int dev) +void radio_isa_remove(struct device *pdev, unsigned int dev) { struct radio_isa_card *isa = dev_get_drvdata(pdev); - return radio_isa_common_remove(isa, isa->drv->region_size); + radio_isa_common_remove(isa, isa->drv->region_size); } EXPORT_SYMBOL_GPL(radio_isa_remove); diff --git a/drivers/media/radio/radio-isa.h b/drivers/media/radio/radio-isa.h index 2f0736edfda8..c9159958203e 100644 --- a/drivers/media/radio/radio-isa.h +++ b/drivers/media/radio/radio-isa.h @@ -91,7 +91,7 @@ struct radio_isa_driver { int radio_isa_match(struct device *pdev, unsigned int dev); int radio_isa_probe(struct device *pdev, unsigned int dev); -int radio_isa_remove(struct device *pdev, unsigned int dev); +void radio_isa_remove(struct device *pdev, unsigned int dev); #ifdef CONFIG_PNP int radio_isa_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id); base-commit: e609571b5ffa3528bf85292de1ceaddac342bc1c -- 2.29.2

3 3

[PATCH v3 0/6] Clock and reset improvements for Tegra ALSA drivers
by Dmitry Osipenko 26 Jan '21

26 Jan '21

This series improves the handling of clock and reset controls of NVIDA Tegra ALSA drivers. Tegra HDA and AHUB drivers aren't handling resets properly, which needs to be fixed in order to unblock other patches related to fixes of the reset controller driver since HDA/AHUB are bound to fail once reset controller driver will be corrected. In particular ALSA drivers are relying on implicit de-assertion of resets which is done by the tegra-clk driver. It's not the business of the clk driver to touch resets and we need to fix this because it breaks reset/clk programming sequences of other Tegra drivers. Changelog: v3: - Reworked "hda/tegra: Reset hardware" and "ahub: Reset hardware properly" patches, they now use usleep + reset_deassert() instead of reset_reset(). Suggested by Thierry Reding. - Added new patch "hda/tegra: Remove unnecessary null-check from hda_tegra_runtime_resume()". Suggested by Thierry Reding. - Replaced "ahub: Reset hardware properly" patch with "ahub: Add missing resets". Suggested by Thierry Reding. - Slightly improved commit messages. - Added acks from Thierry Reding. v2: - Added regcache_sync() to the "ahub: Reset hardware properly" patch, which was missed by accident in v1. - Corrected typo in the format of the error message in "ahub: Use of_reset_control_array_get_exclusive()" patch by s/%p/%pe/. Dmitry Osipenko (6): ALSA: hda/tegra: Use clk_bulk helpers ALSA: hda/tegra: Reset hardware ALSA: hda/tegra: Remove unnecessary null-check from hda_tegra_runtime_resume() ASoC: tegra: ahub: Add missing resets ASoC: tegra: ahub: Use clk_bulk helpers ASoC: tegra: ahub: Reset hardware properly sound/pci/hda/hda_tegra.c | 90 ++++++++++++---------------------- sound/soc/tegra/tegra30_ahub.c | 64 ++++++++++++++---------- sound/soc/tegra/tegra30_ahub.h | 5 +- 3 files changed, 72 insertions(+), 87 deletions(-) -- 2.29.2

3 13

[PATCH] ALSA: bebob: remove an unnecessary condition in hwdep_read()
by Takashi Sakamoto 26 Jan '21

26 Jan '21

Drivers in ALSA firewire stack supports eventing to userspace applications via ALSA hwdep interface. All of the drivers supports stream lock events. Some of them supports their unique events according to specification of target device. ALSA bebob driver supports the stream lock event only. In the case, it's enough to check condition only in loop with process blocking. However, current implementation check it again after breaking the loop. This commit removes the redundant check. Reported-by: Dan Carpenter <dan.carpenter(a)oracle.com> Reported-by: Christophe JAILLET <christophe.jaillet(a)wanadoo.fr> Signed-off-by: Takashi Sakamoto <o-takashi(a)sakamocchi.jp> --- sound/firewire/bebob/bebob_hwdep.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sound/firewire/bebob/bebob_hwdep.c b/sound/firewire/bebob/bebob_hwdep.c index 8677e3ec8d14..6f9331655d43 100644 --- a/sound/firewire/bebob/bebob_hwdep.c +++ b/sound/firewire/bebob/bebob_hwdep.c @@ -37,11 +37,9 @@ hwdep_read(struct snd_hwdep *hwdep, char __user *buf, long count, memset(&event, 0, sizeof(event)); count = min_t(long, count, sizeof(event.lock_status)); - if (bebob->dev_lock_changed) { - event.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS; - event.lock_status.status = (bebob->dev_lock_count > 0); - bebob->dev_lock_changed = false; - } + event.lock_status.type = SNDRV_FIREWIRE_EVENT_LOCK_STATUS; + event.lock_status.status = (bebob->dev_lock_count > 0); + bebob->dev_lock_changed = false; spin_unlock_irq(&bebob->lock); -- 2.27.0

2 1

[PATCH] ASoC: dmaengine_pcm: add peripheral configuration
by Shengjiu Wang 26 Jan '21

26 Jan '21

The commit e7bbb7acabf4 ("dmaengine: add peripheral configuration") adds peripheral configuration for dma_slave_config. This configuration is useful for some audio peripherals, for example, the peripheral supports multi fifos, we can let the DMA know which fifos are selected. So also add this configuration for snd_dmaengine_dai_dma_data. Signed-off-by: Shengjiu Wang <shengjiu.wang(a)nxp.com> --- include/sound/dmaengine_pcm.h | 5 +++++ sound/core/pcm_dmaengine.c | 2 ++ 2 files changed, 7 insertions(+) diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h index 8c5e38180fb0..96666efddb39 100644 --- a/include/sound/dmaengine_pcm.h +++ b/include/sound/dmaengine_pcm.h @@ -66,6 +66,9 @@ struct dma_chan *snd_dmaengine_pcm_get_chan(struct snd_pcm_substream *substream) * @chan_name: Custom channel name to use when requesting DMA channel. * @fifo_size: FIFO size of the DAI controller in bytes * @flags: PCM_DAI flags, only SND_DMAENGINE_PCM_DAI_FLAG_PACK for now + * @peripheral_config: peripheral configuration for programming peripheral + * for dmaengine transfer + * @peripheral_size: peripheral configuration buffer size */ struct snd_dmaengine_dai_dma_data { dma_addr_t addr; @@ -76,6 +79,8 @@ struct snd_dmaengine_dai_dma_data { const char *chan_name; unsigned int fifo_size; unsigned int flags; + void *peripheral_config; + size_t peripheral_size; }; void snd_dmaengine_pcm_set_config_from_dai_data( diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index 4d0e8fe535a1..1fc2fa077574 100644 --- a/sound/core/pcm_dmaengine.c +++ b/sound/core/pcm_dmaengine.c @@ -125,6 +125,8 @@ void snd_dmaengine_pcm_set_config_from_dai_data( } slave_config->slave_id = dma_data->slave_id; + slave_config->peripheral_config = dma_data->peripheral_config; + slave_config->peripheral_size = dma_data->peripheral_size; } EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_set_config_from_dai_data); -- 2.27.0

1 0

bug report: ALSA woke us up to write new data to the device, but there was actually nothing to write. Most likely this is a bug in the ALSA driver 'snd_usb_audio'
by lotus2＠tutanota.com 26 Jan '21

26 Jan '21

```$ journalctl -p3 -b --no-hostname -- Journal begins at Sun 2020-10-18 22:41:56 CEST, ends at Tue 2021-01-26 03:39:21 CET. -- Jan 26 01:29:10 pulseaudio[882]: GetManagedObjects() failed: org.freedesktop.DBus.Error.TimedOut: Failed to activate service 'org.bluez': timed out (service_start_timeout=25000ms) Jan 26 02:41:14 pulseaudio[882]: ALSA woke us up to write new data to the device, but there was actually nothing to write. Jan 26 02:41:14 pulseaudio[882]: Most likely this is a bug in the ALSA driver 'snd_usb_audio'. Please report this issue to the ALSA developers. Jan 26 02:41:14 pulseaudio[882]: We were woken up with POLLOUT set -- however a subsequent snd_pcm_avail() returned 0 or another value < min_avail. $ ``` I reported the `alsa-info_alsa-info.sh` output automatically and it is attached here Operating System: Manjaro Linux KDE Plasma Version: 5.20.5 KDE Frameworks Version: 5.78.0 Qt Version: 5.15.2 Kernel Version: 5.10.10-1-MANJARO OS Type: 64-bit

1 0

[PATCH] ASoC: Intel: sof_sdw: set proper flags for Dell TGL-H SKU 0A5E
by Kai Vehmanen 25 Jan '21

25 Jan '21

From: Libin Yang <libin.yang(a)intel.com> Add flag "SOF_RT711_JD_SRC_JD2", flag "SOF_RT715_DAI_ID_FIX" and "SOF_SDW_FOUR_SPK" to the Dell TGL-H based SKU "0A5E". Signed-off-by: Libin Yang <libin.yang(a)intel.com> Co-developed-by: Hui Wang <hui.wang(a)canonical.com> Signed-off-by: Hui Wang <hui.wang(a)canonical.com> Reviewed-by: Bard Liao <bard.liao(a)intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart(a)linux.intel.com> Signed-off-by: Kai Vehmanen <kai.vehmanen(a)linux.intel.com> --- sound/soc/intel/boards/sof_sdw.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index ca968901ac96..6d0d6ef711e0 100644 --- a/sound/soc/intel/boards/sof_sdw.c +++ b/sound/soc/intel/boards/sof_sdw.c @@ -67,6 +67,16 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { .driver_data = (void *)(SOF_RT711_JD_SRC_JD2 | SOF_RT715_DAI_ID_FIX), }, + { + .callback = sof_sdw_quirk_cb, + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A5E") + }, + .driver_data = (void *)(SOF_RT711_JD_SRC_JD2 | + SOF_RT715_DAI_ID_FIX | + SOF_SDW_FOUR_SPK), + }, { .callback = sof_sdw_quirk_cb, .matches = { -- 2.29.2

3 2

[PATCH v2] ASoC: qcom: lpass: Fix out-of-bounds DAI ID lookup
by Stephan Gerhold 25 Jan '21

25 Jan '21

The "dai_id" given into LPAIF_INTFDMA_REG(...) is already the real DAI ID, not an index into v->dai_driver. Looking it up again seems entirely redundant. For IPQ806x (and SC7180 since commit 09a4f6f5d21c ("ASoC: dt-bindings: lpass: Fix and common up lpass dai ids") this is now often an out-of-bounds read because the indexes in the "dai_driver" array no longer match the actual DAI ID. Cc: Srinivasa Rao Mandadapu <srivasam(a)codeaurora.org> Cc: Srinivas Kandagatla <srinivas.kandagatla(a)linaro.org> Fixes: 7cb37b7bd0d3 ("ASoC: qcom: Add support for lpass hdmi driver") Signed-off-by: Stephan Gerhold <stephan(a)gerhold.net> --- Changes in v2: - Extracted from https://lore.kernel.org/alsa-devel/20210114094615.58191-2-stephan@gerhold.n… - Change commit message to clarify that this is usually not just redundant now but actually a broken out-of-bounds lookup. --- sound/soc/qcom/lpass-lpaif-reg.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/qcom/lpass-lpaif-reg.h b/sound/soc/qcom/lpass-lpaif-reg.h index 405542832e99..baf72f124ea9 100644 --- a/sound/soc/qcom/lpass-lpaif-reg.h +++ b/sound/soc/qcom/lpass-lpaif-reg.h @@ -133,7 +133,7 @@ #define LPAIF_WRDMAPERCNT_REG(v, chan) LPAIF_WRDMA_REG_ADDR(v, 0x14, (chan)) #define LPAIF_INTFDMA_REG(v, chan, reg, dai_id) \ - ((v->dai_driver[dai_id].id == LPASS_DP_RX) ? \ + ((dai_id == LPASS_DP_RX) ? \ LPAIF_HDMI_RDMA##reg##_REG(v, chan) : \ LPAIF_RDMA##reg##_REG(v, chan)) -- 2.30.0

3 2