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

[PATCH] ASoC: codecs: lpass-wsa-macro: Check for error pointer after calling devm_regmap_init_mmio
by Jiasheng Jiang 10 Jan '22

10 Jan '22

The devm_regmap_init_mmio() may return error pointer in some cases, for example the possible failure of the kzalloc() in regmap_mmio_gen_context(). Then the wsa->regmap will be error pointer and be used in wsa_macro_mclk_enable(). Therefore, it should be better to check it in order to avoid the dereference of the error pointer. Fixes: 809bcbcecebf ("ASoC: codecs: lpass-wsa-macro: Add support to WSA Macro") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- sound/soc/codecs/lpass-wsa-macro.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c index d3ac318fd6b6..dd1a8b7bc794 100644 --- a/sound/soc/codecs/lpass-wsa-macro.c +++ b/sound/soc/codecs/lpass-wsa-macro.c @@ -2405,6 +2405,8 @@ static int wsa_macro_probe(struct platform_device *pdev) return PTR_ERR(base); wsa->regmap = devm_regmap_init_mmio(dev, base, &wsa_regmap_config); + if (IS_ERR(wsa->regmap)) + return PTR_ERR(wsa->regmap); dev_set_drvdata(dev, wsa); -- 2.25.1

2 1

[PATCH 0/7] ASoC/SoundWire: improve suspend flows and use set_stream() instead of set_tdm_slots() for HDAudio
by Bard Liao 10 Jan '22

10 Jan '22

This series contains three topics. 1. SoundWire: Intel: remove pdm support 2. ASoC/SoundWire: dai: expand 'stream' concept beyond SoundWire 3. ASoC/SOF/SoundWire: fix suspend-resume on pause with dynamic pipelines The topics are independent but the changes are dependent. So please allow me to send them in one series. Pierre-Louis Bossart (6): ASOC: SOF: Intel: use snd_soc_dai_get_widget() ASoC/soundwire: intel: simplify callbacks for params/hw_free ASoC/SoundWire: dai: expand 'stream' concept beyond SoundWire ASoC: Intel/SOF: use set_stream() instead of set_tdm_slots() for HDAudio soundwire: intel: remove unnecessary init soundwire: intel: remove PDM support Ranjani Sridharan (1): soundwire: intel: improve suspend flows drivers/soundwire/cadence_master.c | 36 +--- drivers/soundwire/cadence_master.h | 14 +- drivers/soundwire/intel.c | 253 ++++++++++++++-------------- drivers/soundwire/qcom.c | 8 +- drivers/soundwire/stream.c | 4 +- include/linux/soundwire/sdw_intel.h | 4 +- include/sound/soc-dai.h | 32 ++-- sound/soc/codecs/hdac_hda.c | 22 +-- sound/soc/codecs/max98373-sdw.c | 2 +- sound/soc/codecs/rt1308-sdw.c | 2 +- sound/soc/codecs/rt1316-sdw.c | 2 +- sound/soc/codecs/rt5682-sdw.c | 2 +- sound/soc/codecs/rt700.c | 2 +- sound/soc/codecs/rt711-sdca.c | 2 +- sound/soc/codecs/rt711.c | 2 +- sound/soc/codecs/rt715-sdca.c | 2 +- sound/soc/codecs/rt715.c | 2 +- sound/soc/codecs/sdw-mockup.c | 2 +- sound/soc/codecs/wcd938x.c | 2 +- sound/soc/codecs/wsa881x.c | 2 +- sound/soc/intel/boards/sof_sdw.c | 6 +- sound/soc/intel/skylake/skl-pcm.c | 7 +- sound/soc/qcom/sdm845.c | 4 +- sound/soc/qcom/sm8250.c | 4 +- sound/soc/sof/intel/hda-dai.c | 7 +- sound/soc/sof/intel/hda.c | 12 +- 26 files changed, 190 insertions(+), 247 deletions(-) -- 2.17.1

5 23

[PATCH] drivers/soundwire: remove redundant val variable
by cgel.zte＠gmail.com 10 Jan '22

10 Jan '22

From: Minghao Chi <chi.minghao(a)zte.com.cn> Return value from SWRM_REG_VAL_PACK() directly instead of taking this in another redundant variable. Reported-by: Zeal Robot <zealci(a)zte.com.cn> Signed-off-by: Minghao Chi <chi.minghao(a)zte.com.cn> Signed-off-by: CGEL ZTE <cgel.zte(a)gmail.com> --- drivers/soundwire/qcom.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/soundwire/qcom.c b/drivers/soundwire/qcom.c index 54813417ef8e..77f9c90370be 100644 --- a/drivers/soundwire/qcom.c +++ b/drivers/soundwire/qcom.c @@ -235,7 +235,6 @@ static int qcom_swrm_cpu_reg_write(struct qcom_swrm_ctrl *ctrl, int reg, static u32 swrm_get_packed_reg_val(u8 *cmd_id, u8 cmd_data, u8 dev_addr, u16 reg_addr) { - u32 val; u8 id = *cmd_id; if (id != SWR_BROADCAST_CMD_ID) { @@ -245,9 +244,8 @@ static u32 swrm_get_packed_reg_val(u8 *cmd_id, u8 cmd_data, id = 0; *cmd_id = id; } - val = SWRM_REG_VAL_PACK(cmd_data, dev_addr, id, reg_addr); - return val; + return SWRM_REG_VAL_PACK(cmd_data, dev_addr, id, reg_addr); } static int swrm_wait_for_rd_fifo_avail(struct qcom_swrm_ctrl *swrm) -- 2.25.1

2 1

[PATCH 5/5] ASoC: sh: rz-ssi: Add functions to get/set substream pointer
by Lad Prabhakar 10 Jan '22

10 Jan '22

A copy of substream pointer is stored in priv structure during rz_ssi_dai_trigger() callback ie in SNDRV_PCM_TRIGGER_START case and the pointer is assigned to NULL in case of SNDRV_PCM_TRIGGER_STOP. The driver used the locks only in rz_ssi_stream_is_valid() and assigned the local substream pointer to NULL in rz_ssi_dai_trigger() callback and in rest of the driver no locking was used while assigning substream pointer. This patch adds functions to get/set substream pointer with locks acquired and replaces the instances of access to substream pointer with the get/set functions. Reported-by: Pavel Machek <pavel(a)denx.de> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj(a)bp.renesas.com> Reviewed-by: Biju Das <biju.das.jz(a)bp.renesas.com> --- sound/soc/sh/rz-ssi.c | 55 ++++++++++++++++++++++++++++++++----------- 1 file changed, 41 insertions(+), 14 deletions(-) diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/sh/rz-ssi.c index aabd15e9d515..057aedacedec 100644 --- a/sound/soc/sh/rz-ssi.c +++ b/sound/soc/sh/rz-ssi.c @@ -201,12 +201,36 @@ static bool rz_ssi_stream_is_valid(struct rz_ssi_priv *ssi, return ret; } +static struct snd_pcm_substream *rz_ssi_get_substream(struct rz_ssi_stream *strm) +{ + struct rz_ssi_priv *ssi = strm->priv; + struct snd_pcm_substream *substream; + unsigned long flags; + + spin_lock_irqsave(&ssi->lock, flags); + substream = strm->substream; + spin_unlock_irqrestore(&ssi->lock, flags); + + return substream; +} + +static void rz_ssi_set_substream(struct rz_ssi_stream *strm, + struct snd_pcm_substream *substream) +{ + struct rz_ssi_priv *ssi = strm->priv; + unsigned long flags; + + spin_lock_irqsave(&ssi->lock, flags); + strm->substream = substream; + spin_unlock_irqrestore(&ssi->lock, flags); +} + static void rz_ssi_stream_init(struct rz_ssi_stream *strm, struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; - strm->substream = substream; + rz_ssi_set_substream(strm, substream); strm->sample_width = samples_to_bytes(runtime, 1); strm->dma_buffer_pos = 0; strm->period_counter = 0; @@ -223,12 +247,13 @@ static void rz_ssi_stream_init(struct rz_ssi_stream *strm, static void rz_ssi_stream_quit(struct rz_ssi_priv *ssi, struct rz_ssi_stream *strm) { - struct snd_soc_dai *dai = rz_ssi_get_dai(strm->substream); - unsigned long flags; + struct snd_pcm_substream *substream; + struct snd_soc_dai *dai; - spin_lock_irqsave(&ssi->lock, flags); - strm->substream = NULL; - spin_unlock_irqrestore(&ssi->lock, flags); + substream = rz_ssi_get_substream(strm); + rz_ssi_set_substream(strm, NULL); + + dai = rz_ssi_get_dai(substream); if (strm->oerr_num > 0) dev_info(dai->dev, "overrun = %d\n", strm->oerr_num); @@ -301,7 +326,8 @@ static int rz_ssi_clk_setup(struct rz_ssi_priv *ssi, unsigned int rate, static int rz_ssi_start(struct rz_ssi_priv *ssi, struct rz_ssi_stream *strm) { - bool is_play = rz_ssi_stream_is_play(ssi, strm->substream); + struct snd_pcm_substream *substream = rz_ssi_get_substream(strm); + bool is_play = rz_ssi_stream_is_play(ssi, substream); u32 ssicr, ssifcr; ssicr = rz_ssi_reg_readl(ssi, SSICR); @@ -382,7 +408,7 @@ static int rz_ssi_stop(struct rz_ssi_priv *ssi, struct rz_ssi_stream *strm) static void rz_ssi_pointer_update(struct rz_ssi_stream *strm, int frames) { - struct snd_pcm_substream *substream = strm->substream; + struct snd_pcm_substream *substream = rz_ssi_get_substream(strm); struct snd_pcm_runtime *runtime; int current_period; @@ -399,14 +425,14 @@ static void rz_ssi_pointer_update(struct rz_ssi_stream *strm, int frames) current_period = strm->buffer_pos / runtime->period_size; if (strm->period_counter != current_period) { - snd_pcm_period_elapsed(strm->substream); + snd_pcm_period_elapsed(substream); strm->period_counter = current_period; } } static int rz_ssi_pio_recv(struct rz_ssi_priv *ssi, struct rz_ssi_stream *strm) { - struct snd_pcm_substream *substream = strm->substream; + struct snd_pcm_substream *substream = rz_ssi_get_substream(strm); struct snd_pcm_runtime *runtime; bool done = false; u16 *buf; @@ -464,7 +490,7 @@ static int rz_ssi_pio_recv(struct rz_ssi_priv *ssi, struct rz_ssi_stream *strm) static int rz_ssi_pio_send(struct rz_ssi_priv *ssi, struct rz_ssi_stream *strm) { - struct snd_pcm_substream *substream = strm->substream; + struct snd_pcm_substream *substream = rz_ssi_get_substream(strm); struct snd_pcm_runtime *runtime = substream->runtime; int sample_space; int samples = 0; @@ -588,7 +614,7 @@ static int rz_ssi_dma_slave_config(struct rz_ssi_priv *ssi, static int rz_ssi_dma_transfer(struct rz_ssi_priv *ssi, struct rz_ssi_stream *strm) { - struct snd_pcm_substream *substream = strm->substream; + struct snd_pcm_substream *substream = rz_ssi_get_substream(strm); struct dma_async_tx_descriptor *desc; struct snd_pcm_runtime *runtime; enum dma_transfer_direction dir; @@ -646,12 +672,13 @@ static int rz_ssi_dma_transfer(struct rz_ssi_priv *ssi, static void rz_ssi_dma_complete(void *data) { struct rz_ssi_stream *strm = (struct rz_ssi_stream *)data; + struct snd_pcm_substream *substream = rz_ssi_get_substream(strm); - if (!strm->running || !strm->substream || !strm->substream->runtime) + if (!strm->running || !substream || !substream->runtime) return; /* Note that next DMA transaction has probably already started */ - rz_ssi_pointer_update(strm, strm->substream->runtime->period_size); + rz_ssi_pointer_update(strm, substream->runtime->period_size); /* Queue up another DMA transaction */ rz_ssi_dma_transfer(strm->priv, strm); -- 2.17.1

3 2

New lockdep warning in broonie/sound.git/for-5.17
by Hans de Goede 10 Jan '22

10 Jan '22

Hi All, After rebasing my recent Bay Trail rt5640 patch series on top of broonie/sound.git/for-5.17 I'm seeing the following new lockdep warning on devices running the rebased branch: [ 131.404755] ============================================ [ 131.404762] WARNING: possible recursive locking detected [ 131.404769] 5.16.0-rc8+ #758 Tainted: G C [ 131.404777] -------------------------------------------- [ 131.404782] pipewire/1372 is trying to acquire lock: [ 131.404789] ffffa090838535a0 (&group->mutex){+.+.}-{3:3}, at: _snd_pcm_stream_lock_irqsave+0x2b/0x30 [snd_pcm] [ 131.404845] but task is already holding lock: [ 131.404851] ffffa09088e981a0 (&group->mutex){+.+.}-{3:3}, at: snd_pcm_action_lock_irq+0x2d/0x90 [snd_pcm] [ 131.404894] other info that might help us debug this: [ 131.404899] Possible unsafe locking scenario: [ 131.404905] CPU0 [ 131.404909] ---- [ 131.404913] lock(&group->mutex); [ 131.404923] lock(&group->mutex); [ 131.404932] *** DEADLOCK *** [ 131.404937] May be due to missing lock nesting notation [ 131.404942] 1 lock held by pipewire/1372: [ 131.404950] #0: ffffa09088e981a0 (&group->mutex){+.+.}-{3:3}, at: snd_pcm_action_lock_irq+0x2d/0x90 [snd_pcm] [ 131.404994] stack backtrace: [ 131.405001] CPU: 2 PID: 1372 Comm: pipewire Tainted: G C 5.16.0-rc8+ #758 [ 131.405012] Hardware name: ASUSTeK COMPUTER INC. TF103CE/TF103CE, BIOS 5.6.5 09/03/2015 [ 131.405019] Call Trace: [ 131.405022] sd 0:0:0:0: [sda] 31805439 512-byte logical blocks: (16.3 GB/15.2 GiB) [ 131.405027] <TASK> [ 131.405034] dump_stack_lvl+0x59/0x73 [ 131.405057] __lock_acquire.cold+0xc5/0x2b8 [ 131.405081] lock_acquire+0xb5/0x2b0 [ 131.405095] ? _snd_pcm_stream_lock_irqsave+0x2b/0x30 [snd_pcm] [ 131.405128] ? lock_is_held_type+0xa8/0x120 [ 131.405148] __mutex_lock+0x92/0x8a0 [ 131.405163] ? _snd_pcm_stream_lock_irqsave+0x2b/0x30 [snd_pcm] [ 131.405195] ? mark_held_locks+0x49/0x70 [ 131.405208] ? _snd_pcm_stream_lock_irqsave+0x2b/0x30 [snd_pcm] [ 131.405241] ? _raw_spin_unlock_irqrestore+0x2d/0x50 [ 131.405260] ? _snd_pcm_stream_lock_irqsave+0x2b/0x30 [snd_pcm] [ 131.405291] _snd_pcm_stream_lock_irqsave+0x2b/0x30 [snd_pcm] [ 131.405322] dpcm_be_dai_trigger+0xae/0x410 [snd_soc_core] [ 131.405404] sda: detected capacity change from 0 to 31805439 [ 131.405406] dpcm_fe_dai_do_trigger+0x84/0x1b0 [snd_soc_core] [ 131.405480] snd_pcm_action+0x79/0xc0 [snd_pcm] [ 131.405515] snd_pcm_action_lock_irq+0x3b/0x90 [snd_pcm] [ 131.405549] snd_pcm_ioctl+0x23/0x30 [snd_pcm] [ 131.405581] __x64_sys_ioctl+0x82/0xb0 [ 131.405599] do_syscall_64+0x3b/0x90 [ 131.405612] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 131.405624] RIP: 0033:0x7f70c0b2e37b [ 131.405637] Code: ff ff ff 85 c0 79 9b 49 c7 c4 ff ff ff ff 5b 5d 4c 89 e0 41 5c c3 66 0f 1f 84 00 00 00 00 00 f3 0f 1e fa b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 7d 2a 0f 00 f7 d8 64 89 01 48 [ 131.405647] RSP: 002b:00007ffdfdd46e88 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 [ 131.405660] RAX: ffffffffffffffda RBX: 00005584f8f43a40 RCX: 00007f70c0b2e37b [ 131.405669] RDX: 0000000000000000 RSI: 0000000000004142 RDI: 0000000000000048 [ 131.405676] RBP: 0000000000000002 R08: 00007f70b16eb000 R09: 0000000000000800 [ 131.405684] R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 [ 131.405692] R13: 0000000000000001 R14: 0000000000000000 R15: 0000000000000003 [ 131.405711] </TASK> It seems we now have some nested locking going on without proper lockdep annotations (that or a deadlock, but everything still seems to work fine). Regards, Hans

1 0

[PATCH 4/5] ASoC: sh: rz-ssi: Make return type of rz_ssi_stream_is_valid() to bool
by Lad Prabhakar 10 Jan '22

10 Jan '22

rz_ssi_stream_is_valid() never returns an int, it returns the result of a condition which is either true or false. While at it, drop "!!" as the expression is boolean. Reported-by: Pavel Machek <pavel(a)denx.de> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj(a)bp.renesas.com> Reviewed-by: Biju Das <biju.das.jz(a)bp.renesas.com> --- sound/soc/sh/rz-ssi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/sh/rz-ssi.c index fa68d3a0bd62..aabd15e9d515 100644 --- a/sound/soc/sh/rz-ssi.c +++ b/sound/soc/sh/rz-ssi.c @@ -188,14 +188,14 @@ static inline bool rz_ssi_is_dma_enabled(struct rz_ssi_priv *ssi) return (ssi->playback.dma_ch && (ssi->dma_rt || ssi->capture.dma_ch)); } -static int rz_ssi_stream_is_valid(struct rz_ssi_priv *ssi, - struct rz_ssi_stream *strm) +static bool rz_ssi_stream_is_valid(struct rz_ssi_priv *ssi, + struct rz_ssi_stream *strm) { unsigned long flags; - int ret; + bool ret; spin_lock_irqsave(&ssi->lock, flags); - ret = !!(strm->substream && strm->substream->runtime); + ret = strm->substream && strm->substream->runtime; spin_unlock_irqrestore(&ssi->lock, flags); return ret; -- 2.17.1

1 0

[PATCH 3/5] ASoC: sh: rz-ssi: Drop ssi parameter from rz_ssi_stream_init()
by Lad Prabhakar 10 Jan '22

10 Jan '22

ssi parameter is unused in rz_ssi_stream_init() so just drop it. While at it, change the return type of rz_ssi_stream_init() to void instead of int. Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj(a)bp.renesas.com> Reviewed-by: Biju Das <biju.das.jz(a)bp.renesas.com> --- sound/soc/sh/rz-ssi.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/sh/rz-ssi.c index 16de2633a873..fa68d3a0bd62 100644 --- a/sound/soc/sh/rz-ssi.c +++ b/sound/soc/sh/rz-ssi.c @@ -201,9 +201,8 @@ static int rz_ssi_stream_is_valid(struct rz_ssi_priv *ssi, return ret; } -static int rz_ssi_stream_init(struct rz_ssi_priv *ssi, - struct rz_ssi_stream *strm, - struct snd_pcm_substream *substream) +static void rz_ssi_stream_init(struct rz_ssi_stream *strm, + struct snd_pcm_substream *substream) { struct snd_pcm_runtime *runtime = substream->runtime; @@ -219,8 +218,6 @@ static int rz_ssi_stream_init(struct rz_ssi_priv *ssi, /* fifo init */ strm->fifo_sample_size = SSI_FIFO_DEPTH; - - return 0; } static void rz_ssi_stream_quit(struct rz_ssi_priv *ssi, @@ -728,9 +725,7 @@ static int rz_ssi_dai_trigger(struct snd_pcm_substream *substream, int cmd, rz_ssi_reg_mask_setl(ssi, SSIFCR, SSIFCR_SSIRST, 0); udelay(5); - ret = rz_ssi_stream_init(ssi, strm, substream); - if (ret) - goto done; + rz_ssi_stream_init(strm, substream); if (ssi->dma_rt) { bool is_playback; -- 2.17.1

1 0

[PATCH 2/5] ASoC: sh: rz-ssi: Make the data structures available before registering the handlers
by Lad Prabhakar 10 Jan '22

10 Jan '22

Initialize the spinlock and make the data structures available before registering the interrupt handlers. Reported-by: Pavel Machek <pavel(a)denx.de> Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj(a)bp.renesas.com> Reviewed-by: Biju Das <biju.das.jz(a)bp.renesas.com> --- sound/soc/sh/rz-ssi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rz-ssi.c b/sound/soc/sh/rz-ssi.c index 37466f65c2b0..16de2633a873 100644 --- a/sound/soc/sh/rz-ssi.c +++ b/sound/soc/sh/rz-ssi.c @@ -977,6 +977,9 @@ static int rz_ssi_probe(struct platform_device *pdev) ssi->playback.priv = ssi; ssi->capture.priv = ssi; + spin_lock_init(&ssi->lock); + dev_set_drvdata(&pdev->dev, ssi); + /* Error Interrupt */ ssi->irq_int = platform_get_irq_byname(pdev, "int_req"); if (ssi->irq_int < 0) @@ -1024,8 +1027,6 @@ static int rz_ssi_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); pm_runtime_resume_and_get(&pdev->dev); - spin_lock_init(&ssi->lock); - dev_set_drvdata(&pdev->dev, ssi); ret = devm_snd_soc_register_component(&pdev->dev, &rz_ssi_soc_component, rz_ssi_soc_dai, ARRAY_SIZE(rz_ssi_soc_dai)); -- 2.17.1

1 0

[PATCH] ASoC: codecs: lpass-rx-macro: Check for error pointer after calling devm_regmap_init_mmio
by Jiasheng Jiang 10 Jan '22

10 Jan '22

The devm_regmap_init_mmio() may return error pointer under certain circumstances, for example the possible failure of the kzalloc() in regmap_mmio_gen_context(), which is called by devm_regmap_init_mmio(). Then the rx->regmap will be error pointer and be used in rx_macro_mclk_enable(). Therefore, it should be better to check it in order to avoid the dereference of the error pointer. Fixes: af3d54b99764 ("ASoC: codecs: lpass-rx-macro: add support for lpass rx macro") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- sound/soc/codecs/lpass-rx-macro.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 07894ec5e7a6..2adbf2e2697f 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -3542,6 +3542,8 @@ static int rx_macro_probe(struct platform_device *pdev) return PTR_ERR(base); rx->regmap = devm_regmap_init_mmio(dev, base, &rx_regmap_config); + if (IS_ERR(rx->regmap)) + return PTR_ERR(rx->regmap); dev_set_drvdata(dev, rx); -- 2.25.1

1 0

[PATCH] ASoC: codecs: lpass-tx-macro: Check for error pointer after calling devm_regmap_init_mmio
by Jiasheng Jiang 10 Jan '22

10 Jan '22

The devm_regmap_init_mmio() may return error pointer under certain circumstances, for example the possible failure of the kzalloc() in regmap_mmio_gen_context(), which is called by devm_regmap_init_mmio(). Then the tx->regmap will be error pointer and be used in tx_macro_mclk_enable(). Therefore, it should be better to check it in order to avoid the dereference of the error pointer. Fixes: c39667ddcfc5 ("ASoC: codecs: lpass-tx-macro: add support for lpass tx macro") Signed-off-by: Jiasheng Jiang <jiasheng(a)iscas.ac.cn> --- sound/soc/codecs/lpass-tx-macro.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c index 27a0d5defd27..e4bbc6bd4925 100644 --- a/sound/soc/codecs/lpass-tx-macro.c +++ b/sound/soc/codecs/lpass-tx-macro.c @@ -1803,6 +1803,8 @@ static int tx_macro_probe(struct platform_device *pdev) return PTR_ERR(base); tx->regmap = devm_regmap_init_mmio(dev, base, &tx_regmap_config); + if (IS_ERR(tx->regmap)) + return PTR_ERR(tx->regmap); dev_set_drvdata(dev, tx); -- 2.25.1

1 0